1939dac06c
Conflicts: akka-bbb-apps/build.sbt akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingMessageHandler.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala akka-bbb-fsesl/build.sbt bbb-common-message/build.sbt bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as |
||
|---|---|---|
| .. | ||
| dev | ||
| prod | ||
| config.xml.template | ||
| streams.xml | ||