Merge branch 'PenDetailFragment'
# Conflicts:
#	.idea/misc.xml
commit fd872e57ed226d18779891ea0fbe471f114b4565
2 parents b800820 + feae306
m-mifune authored on 12 Oct 2021
Showing 4 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