Merge branch 'master' into SettingsRest
# Conflicts:
#	src/main/java/com/ntlab/irisserver/entities/Room.java
commit b51253f27d7b25b98a9d2e47b088b9d80d624aa7
2 parents 08ef7ba + e018c98
s-michishita authored on 27 May 2022
Showing 1 changed file
View
src/main/java/com/ntlab/irisserver/entities/Room.java