bigbluebutton-Github/bbb-common-message
Richard Alam 1e8d7a5229 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into try-to-cleanup-connection
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
2016-10-21 19:36:07 +00:00
..
project
src Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into try-to-cleanup-connection 2016-10-21 19:36:07 +00:00
.gitignore
build.sbt Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds 2016-05-20 20:27:52 +00:00
README.md - remove messages from bbb-apps red5 2015-06-10 17:11:36 +00:00