Merge branch 'master' into positionID
# Conflicts: # src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java |
---|
src/main/java/org/ntlab/acanthus_server/entities/Animation.java |
---|
src/main/java/org/ntlab/acanthus_server/entities/Page.java |
---|
src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java |
---|
src/main/java/org/ntlab/acanthus_server/resources/gallery/PagesRest.java |
---|
src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java |
---|