| Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into FriendIconView9 | 
|---|
| app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java | 
|---|
| app/src/main/java/com/example/tampopo_client/views/MainActivity.java | 
|---|