Merge branch 'master' into michishitaEdit
|
---|
.idea/compiler.xml |
---|
.idea/gradle.xml |
---|
.idea/misc.xml |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java |
---|
app/src/main/res/layout/activity_main.xml |
---|
app/src/main/res/layout/animation_home.xml |
---|
app/src/main/res/layout/fragment_home.xml |
---|