Merge branch 'master' into mainActivity_natty
# Conflicts:
#	app/src/main/java/com/example/tampopo_client/views/MainActivity.java
commit 8e3ec67b5efa8ab82144282e59df322a81388dc0
2 parents a5f922d + 41081ec
n-morii authored 7 hours ago
Showing 7 changed files
View
app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java
View
app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
View
app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
View
app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java
View
app/src/main/java/com/example/tampopo_client/views/MainActivity.java
View
app/src/main/java/com/example/tampopo_client/views/TestFriendIconActivity.java
View
app/src/main/res/layout/activity_test_friend_icon.xml