Merge branch 'master' into ShopActivity
commit f53e313b521a3001f43705ff464c5012edf179d7
2 parents b3cffba + 7a817de
k-fujii authored on 3 Oct 2023
Showing 2 changed files
View
app/src/main/java/com/example/nemophila/MapsActivity.java
View
app/src/main/res/layout/filter_friend_item.xml 0 → 100644