Merge remote-tracking branch 'origin/master' into EnterRoom0929

Fork: 0

nitta-lab-2022 / IrisClient

Browse code Merge remote-tracking branch 'origin/master' into EnterRoom0929 # Conflicts: # app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1020 GameViewModel1117 List1025 Okazaki0927 Owner10/27 Owner1101 OwnerRoomActivity cardfragment_bug1105 cardfragment_bug1108 drawingCardFragment_ConnectViewModel drawingCard_endlogic drawingFragment_outputDrawImage drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 fragment-urlToImage master o_game ok_home output_log test01
commit 67e8f393de52725cba42f3eda48d453c35b4f5ad 2 parents 4d5525e + 52ddac1 k-iwamoto authored on 29 Sep 2022

Browse code

# Conflicts:
#	app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java

DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1020 GameViewModel1117 List1025 Okazaki0927 Owner10/27 Owner1101 OwnerRoomActivity cardfragment_bug1105 cardfragment_bug1108 drawingCardFragment_ConnectViewModel drawingCard_endlogic drawingFragment_outputDrawImage drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 fragment-urlToImage master o_game ok_home output_log test01

commit 67e8f393de52725cba42f3eda48d453c35b4f5ad

2 parents 4d5525e + 52ddac1

k-iwamoto authored on 29 Sep 2022

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java

Show line notes below