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/RequestingActivity.java FriendActivity FriendActivity_1017 MypageEditor_icon accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit 952be109c272362e2dfc8b5190cabe1be04c0cb7 2 parents f1ede40 + e0b81f5 k-fujii authored on 28 Sep

Patch

Unified Split

Showing 2 changed files

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

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

Show line notes below