bigbluebutton-Github/bbb-common-message
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 - create a common message project 2015-06-10 15:53:07 +00:00
src Merge into bbb-1.1.dev 2016-03-21 18:12:30 +00:00
.gitignore - create a common message project 2015-06-10 15:53:07 +00:00
build.sbt Merge into bbb-1.1.dev 2016-03-21 18:12:30 +00:00
README.md - remove messages from bbb-apps red5 2015-06-10 17:11:36 +00:00