Richard Alam 39d9c5dd15 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 ... Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as		2015-11-17 02:19:48 -05:00
..
core	Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015	2015-11-17 02:19:48 -05:00
endpoint/redis	- use spray json to decode messages	2015-11-17 02:11:14 -05:00
Boot.scala	- use spray json to decode messages	2015-11-17 02:11:14 -05:00
SystemConfiguration.scala	- implement create breakout room handler	2015-10-28 15:00:37 +00:00