Merge branch 'master' into michishitaEdit
|
---|
.idea/misc.xml |
---|
app/src/main/java/org/ntlab/acanthus_client/Acanthus.java |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java |
---|
app/src/main/java/org/ntlab/acanthus_client/resources/gallery/PagesRest.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/paint/PaintActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModelContainer.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java 0 → 100644 |
---|
app/src/main/res/layout/activity_paint.xml |
---|