Logon sign act #52

Merged IyoShin merged 4 commits into nitta-lab-2023:master from nitta-lab-2023:logon_sign_act on 13 Jun 2023

2023-06-13	c97f24c Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into logon_sign_act ... Conflicts: .idea/misc.xml app/src/main/AndroidManifest.xml k-kimoto committed on 13 Jun 2023
	e08aba5 Browse files » Merge remote-tracking branch 'origin/master' into logon_sign_act ... # Conflicts: # app/src/main/AndroidManifest.xml k-kimoto committed on 13 Jun 2023
	3a73f80 Browse files » Merge remote-tracking branch 'origin/master' into logon_sign_act ... # Conflicts: # .idea/misc.xml # app/src/main/AndroidManifest.xml k-kimoto committed on 13 Jun 2023
	da0e2b2 Browse files » ChangePwActivityの追加とlogin画面の修正 k-kimoto committed on 13 Jun 2023