Hiroki77 #106

Merged s-hatai merged 24 commits into nitta-lab-2025:master from nitta-lab-2025:Hiroki77 on 23 Oct

2025-10-23	e2cdfb6 Browse files » Merge branch 'master' into Hiroki77 HataiShunsuke committed on 23 Oct
	95aac78 Browse files » Merge branch 'master' into Hiroki77 HataiShunsuke committed on 23 Oct
	1ffafdb Browse files » Merge branch 'master' into Hiroki77 HataiShunsuke committed on 23 Oct
	f8a62f2 Browse files » Merge branch 'master' into Hiroki77 HataiShunsuke committed on 23 Oct
	65d663c Browse files » Merge branch 'master' into Hiroki77 HataiShunsuke committed on 23 Oct
	c22c249 Browse files » Merge branch 'master' into Hiroki77 HataiShunsuke committed on 23 Oct
	63ebd53 Browse files » Merge branch 'master' into Hiroki77 HataiShunsuke committed on 23 Oct
	b03ae2e Browse files » Merge branch 'master' into Hiroki77 HataiShunsuke committed on 23 Oct
	bd77b10 Browse files » 修正をしました. h-yamamoto committed on 23 Oct
	ddb9047 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into Hiroki77 h-yamamoto committed on 23 Oct
	311a5c3 Browse files » 修正をしました. h-yamamoto committed on 23 Oct
	022a731 Browse files » Merge pull request #104 from nitta-lab-2025/Hiroki77 ... 確認しました。 HataiShunsuke committed on 23 Oct
	abbf497 Browse files » Merge branch 'master' into Hiroki77 HataiShunsuke committed on 23 Oct
	61a59a9 Browse files » Merge pull request #103 from nitta-lab-2025/chat-rooms ... 確認しました。市井優菜 committed on 23 Oct
	c59f701 Browse files » ChatActivityを修正しました。 g-shimokawa committed on 23 Oct
	20fd61d Browse files » Merge pull request #102 from nitta-lab-2025/chat-rooms ... 確認しました。市井優菜 committed on 23 Oct
	7b667cc Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into chat-rooms g-shimokawa committed on 23 Oct
	e836da9 Browse files » ChatActivityを修正しました。 g-shimokawa committed on 23 Oct
	d2ef314 Browse files » Merge pull request #101 from nitta-lab-2025/mainActivity_natty ... 確認しました西村穂伽 committed on 23 Oct
	8e3ec67 Browse files » Merge branch 'master' into mainActivity_natty ... # Conflicts: # app/src/main/java/com/example/tampopo_client/views/MainActivity.java n-morii committed on 23 Oct
	a5f922d Browse files » MainActivityでアイコンとニックネーム情報を取るためにコミット＆プッシュします。 n-morii committed on 23 Oct
	41081ec Browse files » Merge pull request #100 from nitta-lab-2025/Hiroki77 ... 確認しました。 HataiShunsuke committed on 23 Oct
2025-10-21	8bedaa6 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into chat-rooms g-shimokawa committed on 21 Oct
2025-10-21	384e192 Browse files » ChatActivityとAndroidManifestを修正しました。 g-shimokawa committed on 21 Oct