Merge remote-tracking branch 'origin/master' into addMutableLiveToken
commit 050dea20a317997f6668e95d02ca20e416212f07
2 parents 141d786 + 4a8e78d
HataiShunsuke 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