MainActivityを移動しました。 #7

Merged m-tanaka merged 4 commits into nitta-lab-2025:master from nitta-lab-2025:MainActivity2 on 3 Jul

2025-07-03	cab5bd3 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into MainActivity2 ... # Conflicts: # app/src/main/AndroidManifest.xml g-shimokawa committed on 3 Jul
	c80c32c Browse files » MainActivityを移動しました。 g-shimokawa committed on 3 Jul
	4bb61f3 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into MainActivity2 g-shimokawa committed on 3 Jul
	9f72836 Browse files » MainActivityを移動しました。 g-shimokawa committed on 3 Jul