Merge branch 'master' into mainActivity_natty

Fork: 0

nitta-lab-2025 / tampopo-client

Browse code Merge branch 'master' into mainActivity_natty # Conflicts: # app/src/main/java/com/example/tampopo_client/views/MainActivity.java Setting2 chat-rooms2 fix-chatroom-model mainActivity_natty master
commit 1fce49b72ab479ec5b2982742b3f72f34a26f391 2 parents 745d3bb + be260c2 n-morii authored 9 hours ago

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/Tampopo.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/FriendIconView.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/MainActivity.java

Ignore Space Show notes View app/src/main/res/layout/activity_main.xml

Show line notes below