Merge branch 'master' into ShopActivity

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into ShopActivity Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit 0276c437b16519fe0a129f8a8ac996f222dc99db 2 parents ad2dc55 + 53fbbe7 k-fujii authored on 27 Jun 2023

Browse code

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

commit 0276c437b16519fe0a129f8a8ac996f222dc99db

2 parents ad2dc55 + 53fbbe7

k-fujii authored on 27 Jun 2023

Patch

Unified Split

Showing 2 changed files

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

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

Show line notes below