Merge branch 'master' into Requesting

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into Requesting # Conflicts: # app/src/main/java/com/example/nemophila/FriendActivity.java Cahnge_ ErrorType FixShopViewModel FriendActivity FriendActivity_1017 MPA MypageEditor_icon NewBranch PostAct Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master postAct_genre set_genre
commit 7d10b3e2477f3d042958a78a42fee45204dd5180 2 parents f8d571e + 4613886 k-fujii authored on 20 Jul 2023

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View .idea/misc.xml

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

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

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

Show notes View app/src/main/res/layout/layout_friends_activity.xml 100644 → 0

Show line notes below