Merge branch 'master' into Shop
commit db87569493e34cf8c01e51ec24c12e057de6f330
2 parents 41464e4 + 470d5e1
k-fujii authored on 24 Oct
Showing 5 changed files
View
app/src/main/java/com/example/nemophila/FriendActivity.java
View
app/src/main/java/com/example/nemophila/MapsActivity.java
View
app/src/main/java/com/example/nemophila/MyPageActivity.java
View
app/src/main/java/com/example/nemophila/RequestedActivity.java
View
app/src/main/java/com/example/nemophila/entities/PostJson.java