Richard Alam 16499b3da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi ... Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala akka-bbb-fsesl/build.sbt bigbluebutton-web/build.gradle		2016-01-07 22:58:04 +00:00
..
main	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi	2016-01-07 22:58:04 +00:00
templates	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
test	- use spray json to decode messages	2015-11-17 02:11:14 -05:00
universal/conf	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00