Merge branch 'master' into UserPageEdit
commit 28bfb67af52c6567ca7f7fdafcb49fbc2ffe2311
2 parents b80e549 + fd872e5
k-fujii authored on 12 Oct 2021
Showing 7 changed files
View
.idea/gradle.xml
View
.idea/misc.xml
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java 0 → 100644
View
app/src/main/res/drawable/flame_style.xml 0 → 100644
View
app/src/main/res/layout/fragment_edit.xml
View
app/src/main/res/layout/fragment_home.xml