SendScreenShotActivity #190

Merged g-akagi merged 7 commits into nitta-lab-2021:master from nitta-lab-2021:SendScreenShotActivity on 6 Oct 2021

2021-10-05	b5fd33c Browse files » #173 一部消えていたので微調整２ t-tai committed on 5 Oct 2021
	33dcaa5 Browse files » Merge remote-tracking branch 'origin/SendScreenShotActivity' into SendScreenShotActivity ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/res/layout/activity_send_screen_shot.xml t-tai committed on 5 Oct 2021
	f625c59 Browse files » #173 一部消えていたので微調整 t-tai committed on 5 Oct 2021
	ac146b1 Browse files » Merge branch 'master' into SendScreenShotActivity ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java t-tai committed on 5 Oct 2021
	03382bc Browse files » #173 画面遷移を追加（試行錯誤中） ... SendScreenShotActivity t-tai committed on 5 Oct 2021
2021-09-30	113b0d1 Browse files » Merge branch 'master' into SendScreenShotActivity t-tai committed on 30 Sep 2021
2021-09-30	4573fac Browse files » #173 心がスクショしたがってるんだ。（試行錯誤中） ... SendScreenShotActivity t-tai committed on 30 Sep 2021