Merge branch 'master' into Requesting

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into Requesting # 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 5cc07e03580fcc96da35581bb381e5b040552d6e 2 parents 98de927 + 3aaa5c5 k-fujii 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 5cc07e03580fcc96da35581bb381e5b040552d6e

2 parents 98de927 + 3aaa5c5

k-fujii authored on 11 Jul 2023

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

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

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/entities/AccountNameJson.java

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

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

Show line notes below