Merge branch 'master' into ShopRest

Fork: 0

nitta-lab-2023 / NemophilaServer

Browse code Merge branch 'master' into ShopRest # Conflicts: # src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java 2023/12/21 Fix FriendManager ShopManagerTest ShopPostRest ShopRest accountspostrest addDate fixParameter frinedsRest id master postcount shopsRest shopsRestFix
commit dfe31f2ef7974bfd95680baad9a4292344411b78 2 parents a414a20 + df09513 yugo-asano authored on 18 May 2023

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/models/accounts/Account.java

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostsRest.java

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/AccountRest.java

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/FriendsRest.java

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/RequestedRest.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/RequestingRest.java

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java

Show line notes below