Merge remote-tracking branch 'origin/master' into addHTTPsupport
commit 13fa03f6cc07daa6c7a740ed1038dec68ee8fc85
2 parents aaeb1bd + 4a8e78d
Yuzuki Yoshimura authored 12 hours ago
Showing 2 changed files
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java