Richard Alam a684aa4dfc Merge into bbb-1.1.dev ... Merge master, breakout rooms, and closed captioning into bbb-1.1-dev branch. Conflicts: akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as		2016-03-21 18:12:30 +00:00
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
scala	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
src	Merge into bbb-1.1.dev	2016-03-21 18:12:30 +00:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	Merge into bbb-1.1.dev	2016-03-21 18:12:30 +00:00