Merge branch 'master' into picutures_post
# 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/FollowUidJson.java |
---|
src/main/java/org/ntlab/acanthus_server/entities/FollowerUidJson.java |
---|
src/main/java/org/ntlab/acanthus_server/resources/accounts/FollowsRest.java |
---|
src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java |
---|