Merge remote-tracking branch 'origin/master' into genkiakagi
|
---|
src/main/java/org/ntlab/acanthus_server/entities/Account.java |
---|
src/main/java/org/ntlab/acanthus_server/entities/Animation.java |
---|
src/main/java/org/ntlab/acanthus_server/resources/accounts/AccountsRest.java |
---|
src/main/java/org/ntlab/acanthus_server/resources/gallery/InvitesRest.java |
---|