Merge branch 'master' into picutures_post
# Conflicts:
#	src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java
commit 36bd871dafcc633472071b6979bc4409fa400106
2 parents 68fd941 + 9cdae92
g-akagi authored on 19 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/FollowUidJson.java
View
src/main/java/org/ntlab/acanthus_server/entities/FollowerUidJson.java
View
src/main/java/org/ntlab/acanthus_server/resources/accounts/FollowsRest.java
View
src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java