Merge branch 'master' into account_login

Fork: 0

nitta-lab-2023 / NemophilaServer

Browse code Merge branch 'master' into account_login # Conflicts: # src/main/java/org/ntlab/nemophila/resources/accounts/AccountRest.java 2023/12/21 Accountmanager3 Fix FriendManager ShopManagerTest ShopPostRest ShopRest ShopRestBrabch account1 accountspostrest addDate fixLoginRest fixParameter frinedsRest id master postcount shopsRest shopsRestFix
commit 0610dc8e086646feb64544162767f71a1f71373f 2 parents 073ae4f + 32f77a1 r-nishimura authored on 11 May 2023

Patch

Unified Split

Showing 8 changed files

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

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

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

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/models/shops/Shop.java 0 → 100644

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/FriendsRest.java

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

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

Show line notes below