Fork: 0
nitta-lab-2022 / IrisServer
Browse code
Merge remote-tracking branch 'origin/master' into SettingsRest
# Conflicts:
#	src/main/java/com/ntlab/irisserver/entities/Room.java
DrawingsRest Game GameRest KeywordManager KeywordsRest MemberRest MembersRest Okazaki0621 RoomsRest Shimokawa StateRest fix_setdrawingList_urlLink master o_server ok-server
commit d2c7fb031f706a5998a573267e2dd3b8ab851480
2 parents a28909e + 0e2e1de
s-michishita authored on 27 May 2022
Patch
Unified Split
Showing 2 changed files
View
src/main/java/com/ntlab/irisserver/entities/Room.java
View
src/main/java/com/ntlab/irisserver/models/RoomManager.java