Merge branch 'master' into implement-activity-viewmodel
commit 56db4007ce2016e13dab6e43d278bca20784385a
2 parents 4cf51bd + a937faf
Shohei Yamagiwa authored 4 days ago
Showing 2 changed files
View
app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
View
app/src/main/res/layout/activity_chat.xml