Merge branch 'master' into requesting

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into requesting FriendActivity FriendActivity_1017 MypageEditor_icon accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit af7022143298fc000db9b815c6eb6ad129e36c0b 2 parents c93e564 + 02cbe04 k-fujii authored on 28 Sep 2023

Patch

Unified Split

Showing 3 changed files

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

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

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

Show line notes below