Merge branch 'master' into CreateTodoFragment
commit 64e1e5ecbc1c079965071a83a3357386f455a16a
2 parents 449372b + bd923fa
g-shimokawa authored on 26 Sep
Showing 3 changed files
View
app/src/main/java/com/example/citrusclient/Citrus.java
View
app/src/main/java/com/example/citrusclient/views/HomeFragment.java
View
app/src/main/res/layout/fragment_settings.xml