Merge remote-tracking branch 'origin/master' into LaunchActivity
|
---|
app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/views/LoginActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java |
---|
app/src/main/java/com/example/tampopo_client/views/placeholder/FriendRequestContent.java |
---|
app/src/main/res/layout/fragment_friend_received.xml |
---|