a684aa4dfc
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 |
||
---|---|---|
.. | ||
project | ||
src | ||
.gitignore | ||
build.sbt | ||
README.md |