|
Merge remote-tracking branch 'origin/master'
|
|---|
| app/build.gradle |
|---|
| app/src/main/java/org/ntlab/acanthus_client/Acanthus.java |
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java |
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java |
|---|
| app/src/main/res/img/title.jpg 100644 → 0 |
|---|
|
|
| app/src/main/res/layout/activity_title.xml |
|---|