MainActivity natty #101

Merged h-nishimura merged 2 commits into nitta-lab-2025:master from nitta-lab-2025:mainActivity_natty 10 hours ago

2025-10-23	8e3ec67 Browse files » Merge branch 'master' into mainActivity_natty ... # Conflicts: # app/src/main/java/com/example/tampopo_client/views/MainActivity.java n-morii committed 10 hours ago
2025-10-23	a5f922d Browse files » MainActivityでアイコンとニックネーム情報を取るためにコミット＆プッシュします。 n-morii committed 10 hours ago