Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into FriendIconView6
commit 92e6174c93a9496fe5fed092ed4931cd468ff41d
2 parents 3b5bc1b + 44f9077
h-iwatani authored 13 hours ago
Showing 3 changed files
View
app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java
View
app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
View
app/src/main/java/com/example/tampopo_client/views/MainActivity.java