Ghazi Triki 5fc84b50f0 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages ... # 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		2017-06-19 17:46:46 +01:00
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
scala	First pass moving breakout rooms messages to v2 format.	2017-06-12 20:32:10 +01:00
src	Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages	2017-06-19 17:46:46 +01:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	- remove jedis dependecy	2017-06-08 11:29:44 -07:00