Merge branch 'master' into TestPostJson

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into TestPostJson Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopToMarker ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit d791a44dd6d744c2fa6c81d0beff4de4e368704b 2 parents 1fc6c00 + 9bc4eb7 Katsumasa Watanabe authored on 15 Jun 2023

Browse code

Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopToMarker ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel

commit d791a44dd6d744c2fa6c81d0beff4de4e368704b

2 parents 1fc6c00 + 9bc4eb7

Katsumasa Watanabe authored on 15 Jun 2023

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/AccountsRest.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java

Ignore Space Show notes View app/src/main/res/layout/activity_shop_create.xml

Ignore Space Show notes View app/src/main/res/values/strings.xml

Show line notes below