Merge branch 'master' into ShopActivity

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into ShopActivity FriendActivity FriendActivity_1017 MypageEditor_icon accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit f53e313b521a3001f43705ff464c5012edf179d7 2 parents b3cffba + 7a817de k-fujii authored on 3 Oct

Patch

Unified Split

Showing 2 changed files

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

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

Show line notes below