Merge remote-tracking branch 'origin/master' into LaunchActivity
|
---|
app/src/main/AndroidManifest.xml |
---|
app/src/main/java/com/example/tampopo_client/models/User.java |
---|
app/src/main/java/com/example/tampopo_client/resources/UserResource.java |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendViewModel.java |
---|