Merge remote-tracking branch 'origin/master' into LaunchActivity
commit 0dad387a03a7fe5b800ed8ed65758f2293763fef
2 parents f2c26db + 4c149bd
Yuzuki Yoshimura authored 2 days ago
Showing 5 changed files
View
app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
View
app/src/main/java/com/example/tampopo_client/views/LoginActivity.java
View
app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java
View
app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java
View
app/src/main/res/layout/fragment_friend_received.xml