Merge branch 'master' into implement-activity-viewmodel
commit 4cf51bd659612dad5b1b406a6094109f068e4d21
2 parents cb2ea21 + e55319b
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