Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into FriendIconView9
commit 2aeeb18181e0b8f1d029755fe55b676711a372c1
2 parents f588eb8 + 3060e01
h-iwatani authored 9 hours ago
Showing 2 changed files
View
app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
View
app/src/main/java/com/example/tampopo_client/views/MainActivity.java