Merge branch 'master' into feature/page
commit 17c2a99acb8ba2e071cf411b8b5b463129d0aa11
2 parents 0c98bd4 + 9389d72
s-michishita authored on 20 Jul 2021
Showing 6 changed files
View
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java
View
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
View
app/src/main/res/layout/activity_animation.xml
View
app/src/main/res/menu/bottom_nav_menu.xml
View
app/src/main/res/values/strings.xml