GitBucket
|
Merge branch 'master' into fix_update
# Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java |
|---|
|
|
| app/src/main/java/org/ntlab/acanthus_client/entities/InvitesJson.java 0 → 100644 |
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java |
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java |
|---|
| app/src/main/res/layout/invites_list.xml 0 → 100644 |
|---|