Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into FriendIconView3
commit 433540d4747d71f7811ceee9fb5684c909c93fbd
2 parents 0dcb220 + 61a59a9
h-iwatani authored 10 hours ago
Showing 4 changed files
View
app/src/main/AndroidManifest.xml
View
app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.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