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

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge remote-tracking branch 'origin/master' into fillter # Conflicts: # .idea/deploymentTargetDropDown.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 MPA MypageEditor_icon NewBranch PostAct Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct geticon icon layoutFix logout master postAct_genre set_genre
commit d881ced592172a7d1320ad0ac40befcfd35e4c15 2 parents 22c26dd + d647cf5 r-nishimura authored on 18 Jul 2023

Browse code

# Conflicts:
#	.idea/deploymentTargetDropDown.xml

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

commit d881ced592172a7d1320ad0ac40befcfd35e4c15

2 parents 22c26dd + d647cf5

r-nishimura authored on 18 Jul 2023

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View .idea/misc.xml

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

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

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

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

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

Show line notes below