Merge branch 'develop' into player-report

# Conflicts: # front/src/Connexion/RoomConnection.ts
2020-10-14 15:06:10 +02:00
parent f05f4a7f5b 807ccc49d4
commit 4799460064
11 changed files with 56 additions and 20 deletions
@@ -145,6 +145,7 @@ message RoomJoinedMessage {
  repeated GroupUpdateMessage group = 2;
  repeated ItemStateMessage item = 3;
  int32 currentUserId = 4;
+  repeated string tag = 5;
 }

 message WebRtcStartMessage {