Merge branch 'master' into mainActivity_natty
# Conflicts: # app/src/main/java/com/example/tampopo_client/views/MainActivity.java |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/views/ChatActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/FriendIconView.java |
---|
app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java |
---|
app/src/main/java/com/example/tampopo_client/views/MainActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/TestFriendIconActivity.java |
---|
app/src/main/res/layout/activity_test_friend_icon.xml |
---|