Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2024/CitrusClient into EditSchedule
commit 62a3e6d987d77f97622614b931e941fa8e8f48d1
2 parents 0f7b0ed + f6dd90b
g-shimokawa authored on 10 Oct
Showing 5 changed files
View
app/src/main/java/com/example/citrusclient/views/AccountColorDialogFragment.java
View
app/src/main/java/com/example/citrusclient/views/CalendarFragment.java
View
app/src/main/java/com/example/citrusclient/views/OtherCalendarFragment.java
View
app/src/main/java/com/example/citrusclient/views/SettingsFragment.java
View
app/src/main/res/layout/fragment_settings.xml