21b8c703a5
Conflicts: akka-bbb-apps/scala/JsonTest.sc akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala |
||
---|---|---|
.. | ||
BreakoutRoom.sc | ||
JsonTest.sc | ||
Test2.sc | ||
TestWorksheet.sc |