Merge branch 'master' into positionID
# Conflicts:
#	src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java
commit e02ab0bb05c899d8fbc4d76a91a08461475b40e4
2 parents 4d6b392 + 303b09d
k-fujii authored on 12 Oct 2021
Showing 5 changed files
View
src/main/java/org/ntlab/acanthus_server/entities/Animation.java
View
src/main/java/org/ntlab/acanthus_server/entities/Page.java
View
src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java
View
src/main/java/org/ntlab/acanthus_server/resources/gallery/PagesRest.java
View
src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java