Merge branch 'master' into main2_7

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into main2_7_6 # Conflicts: # app/src/main/AndroidManifest.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 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 8161b6a9ee41b00e3c6221a67b8ee27f9a6e0bca 2 parents 3036fdf + 080823d r-nishimura authored on 6 Jul 2023

Browse code

Merge branch 'master' into main2_7_6

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

Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 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 8161b6a9ee41b00e3c6221a67b8ee27f9a6e0bca

2 parents 3036fdf + 080823d

r-nishimura authored on 6 Jul 2023

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View .idea/misc.xml

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/RequestedAdapter.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/RequestingActivity.java 0 → 100644

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

Ignore Space Show notes View app/src/main/res/layout/activity_requesting.xml 0 → 100644

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

Ignore Space Show notes View app/src/main/res/values/strings.xml

Show line notes below