Merge remote-tracking branch 'origin/master' into LaunchActivity
commit b1addd6768dda9ef8d90208a674f9bd6223ef9d4
2 parents f4df8b5 + ae285d5
Yuzuki Yoshimura authored 3 days ago
Showing 4 changed files
View
app/src/main/java/com/example/tampopo_client/models/FriendRequest.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/resources/FriendRequestResource.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/resources/FriendsResource.java
View
app/src/main/res/layout/activity_register.xml