Merge branch 'master' into inviteActivity
|
---|
.idea/misc.xml |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java |
---|
app/src/main/res/drawable/flame_edit_list.xml 0 → 100644 |
---|
app/src/main/res/drawable/flame_home_list.xml 0 → 100644 |
---|
app/src/main/res/drawable/flame_style.xml 100644 → 0 |
---|
app/src/main/res/drawable/hamburger.jpg 0 → 100644 |
---|
|
app/src/main/res/drawable/ic_baseline_person.xml 0 → 100644 |
---|
app/src/main/res/drawable/note.png 0 → 100644 |
---|
|
app/src/main/res/drawable/yellow_gabyou.png 0 → 100644 |
---|
|
app/src/main/res/layout/activity_main.xml |
---|
app/src/main/res/layout/animation_home.xml |
---|
app/src/main/res/layout/fragment_edit.xml |
---|
app/src/main/res/layout/fragment_home.xml |
---|
app/src/main/res/layout/list.xml |
---|
app/src/main/res/layout/work_list.xml |
---|
app/src/main/res/menu/bottom_nav_menu.xml |
---|