bigbluebutton-Github/akka-bbb-apps/scala
Richard Alam 21b8c703a5 Merge branch 'breakout-rooms-porto-algre-2015' of https://github.com/riadvice/bigbluebutton into breakout-rooms-porto-algre-2015
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
2016-02-01 16:12:06 +00:00
..
BreakoutRoom.sc Added more scala worksheet to test breakout room feature. 2016-01-13 18:20:51 +01:00
JsonTest.sc Merge branch 'breakout-rooms-porto-algre-2015' of https://github.com/riadvice/bigbluebutton into breakout-rooms-porto-algre-2015 2016-02-01 16:12:06 +00:00
Test2.sc - use spray json to decode messages 2015-11-17 02:11:14 -05:00
TestWorksheet.sc Added more scala worksheet to test breakout room feature. 2016-01-13 18:20:51 +01:00