Merge branch 'master' into michishitaEdit
commit 7a13c54b7dbaa6187e5246745da8a187ae4a05ba
2 parents 04be1d1 + 5d78ef5
s-michishita authored on 2 Jul 2021
Showing 5 changed files
View
.idea/runConfigurations.xml 0 → 100644
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/entities/WorkJson.java
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java