5fc84b50f0
# Conflicts: # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/UserJoinMeetingReqMsgHdlr.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala # bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala # bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala # bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as # bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as |
||
---|---|---|
.. | ||
project | ||
src | ||
.gitignore | ||
build.sbt | ||
deploy.sh | ||
README.md |