Merge branch 'master' into michishitaEdit
commit ad42f3816120ccb3ed3d6d930aca6b96f5b37ff5
2 parents 1332ef8 + 14646e4
s-michishita authored on 16 Jul 2021
Showing 11 changed files
View
.idea/misc.xml
View
app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
View
app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java
View
app/src/main/java/org/ntlab/acanthus_client/resources/gallery/PagesRest.java 0 → 100644
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModelContainer.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java 0 → 100644
View
app/src/main/res/layout/activity_paint.xml