FriendActivity 1 #41

Merged h-nishimura merged 3 commits into nitta-lab-2025:master from nitta-lab-2025:FriendActivity-1 1 day ago

2025-07-17	aa41813 Browse files » 変更を保存します t-watanabe committed 1 day ago
	9031c36 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into FriendActivity-1 ... # Conflicts: # app/src/main/res/layout/activity_friend.xml # app/src/main/res/menu/bottom_nav_menu.xml # app/src/main/res/values/strings.xml t-watanabe committed 1 day ago
	67eedd1 Browse files » 変更を保存します t-watanabe committed 1 day ago