Merge branch 'master' into feature/#170_create_page_edit
commit 5db39c591304abfb24968806c04c1a3ee1e5609c
2 parents ef24828 + efabb15
k-fujii authored on 7 Oct 2021
Showing 11 changed files
View
.idea/misc.xml
View
app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java
View
app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/SendScreenShotActivity.java
View
app/src/main/res/drawable/icon_jen_1007042258.png 0 → 100644
View
app/src/main/res/layout/activity_animation_detail.xml
View
app/src/main/res/layout/activity_send_screen_shot.xml
View
app/src/main/res/menu/botton_nav_icon.xml 0 → 100644
View
app/src/main/res/values/strings.xml
View
build.gradle
View
gradle/wrapper/gradle-wrapper.properties