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

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge remote-tracking branch 'origin/master' into logon_sign_act # Conflicts: # app/src/main/AndroidManifest.xml 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 ent_Account filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit e08aba55e46a541db5d88e15710b988333457ac4 2 parents 3a73f80 + d668633 k-kimoto authored on 13 Jun 2023

Browse code

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

# Conflicts:
#	app/src/main/AndroidManifest.xml

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 ent_Account filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel

commit e08aba55e46a541db5d88e15710b988333457ac4

2 parents 3a73f80 + d668633

k-kimoto authored on 13 Jun 2023

Patch

Unified Split

Showing 2 changed files

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

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

Show line notes below