Merge remote-tracking branch 'origin/master' into LaunchActivity
commit 8e859682f94aa82ef01484372bf50bf5f2bd90a0
2 parents 6c2cfed + f622d5a
Yuzuki Yoshimura authored 5 days ago
Showing 6 changed files
View
app/src/main/AndroidManifest.xml
View
app/src/main/java/com/example/tampopo_client/models/User.java
View
app/src/main/java/com/example/tampopo_client/resources/UserResource.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendViewModel.java