Merge remote-tracking branch 'origin/master' into genkiakagi
commit 489afe267d93740e6dfbba0043ddc80abbb5132d
2 parents aa7b9cc + 418217a
g-akagi authored on 21 May 2021
Showing 4 changed files
View
src/main/java/org/ntlab/acanthus_server/entities/Account.java
View
src/main/java/org/ntlab/acanthus_server/entities/Animation.java
View
src/main/java/org/ntlab/acanthus_server/resources/accounts/AccountsRest.java
View
src/main/java/org/ntlab/acanthus_server/resources/gallery/InvitesRest.java