Merge remote-tracking branch 'origin/master'
commit fdaef40bde5648f814bc3e2932f3d1d7e1af6293
2 parents f0f4e73 + ebd0499
h-nishimura authored 27 days ago
Showing 2 changed files
View
app/src/main/java/com/example/tampopo_client/models/FriendRequest.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java