Merge branch 'master' into Friend

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into Friend # Conflicts: # .idea/deploymentTargetDropDown.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct RequestedAc Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre sighlogact
commit 667d7db4d461132c073667dbd0a8d87d02aa590e 2 parents b6b6071 + a1924ab t-nagao authored on 11 Jul 2023

Browse code

# Conflicts:
#	.idea/deploymentTargetDropDown.xml

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

commit 667d7db4d461132c073667dbd0a8d87d02aa590e

2 parents b6b6071 + a1924ab

t-nagao authored on 11 Jul 2023

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

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

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

Show line notes below