Merge remote-tracking branch 'origin/master' into AnimationBug

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_server

Browse code Merge remote-tracking branch 'origin/master' into AnimationBug # Conflicts: # src/main/java/org/ntlab/acanthus_server/models/Gallery.java invitesBug master
commit 3fe7329ec5e8f73be5b35df567160e9837891879 2 parents 4ee80f3 + 8cf7845 k-suzuki authored on 1 Jun 2021

Patch

Unified Split

Showing 11 changed files

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/entities/Account.java

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/entities/EditorJson.java

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/entities/Stroke.java

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/entities/WorkJson.java

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/models/Accounts.java

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/models/Gallery.java

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/resources/accounts/InvitedRest.java

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/resources/accounts/WorkRest.java

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/resources/gallery/EditorsRest.java

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/resources/gallery/GalleryRest.java

Ignore Space Show notes View src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java

Show line notes below