Merge branch 'master' into ShopActivity

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into ShopActivity # Conflicts: # .idea/deploymentTargetDropDown.xml FriendActivity FriendActivity_1017 MypageEditor_icon changeicon deleteMethod filter_ic_seturl geticon icon layoutFix master set_genre
commit 8c80bd427870e273b570e4a34195563287c41083 2 parents a3bfe5d + 6829b74 k-fujii authored on 5 Oct 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/MyPageActivity.java

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

Show line notes below