Activity #238

Merged w-katsumasa merged 9 commits into nitta-lab-2023:master from nitta-lab-2023:activity on 28 Sep 2023

2023-09-28	d85c62e Browse files » Merge branch 'master' into activity t-nagao committed on 28 Sep 2023
	bf2fec0 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient ... Conflicts: .idea/deploymentTargetDropDown.xml app/src/main/java/com/example/nemophila/RequestingActivity.java t-nagao committed on 28 Sep 2023
	b23d6a6 Browse files » FriendActivityとRequestingActivityを合併 t-nagao committed on 28 Sep 2023
2023-09-21	05799de Browse files » Merge branch 'activity' t-nagao committed on 21 Sep 2023
	c66892e Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient t-nagao committed on 21 Sep 2023
	12fcc6f Browse files » FriendActivityとRequestingActivityを統一して表示できるように変更しました。 t-nagao committed on 21 Sep 2023
	c82ed35 Browse files » Merge branch 'activity' ... # Conflicts: # .idea/deploymentTargetDropDown.xml t-nagao committed on 21 Sep 2023
	9c781a1 Browse files » FriendActivityとRequestingActivityを統一して表示できるように変更しました。 t-nagao committed on 21 Sep 2023
	58d388c Browse files » 途中経過 ... 使うかどうか未定。 t-nagao committed on 21 Sep 2023