Merge remote-tracking branch 'origin/master' into LaunchActivity
|
---|
app/src/main/java/com/example/tampopo_client/models/FriendRequest.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/resources/FriendRequestResource.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/resources/FriendsResource.java |
---|
app/src/main/res/layout/activity_register.xml |
---|