Richard Alam 7ae9b7b204 Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds ... Conflicts: akka-bbb-apps/build.sbt akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala akka-bbb-fsesl/build.sbt akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala bbb-common-message/build.sbt bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java bigbluebutton-apps/build.gradle bigbluebutton-web/grails-app/conf/spring/resources.xml bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java		2016-05-20 20:27:52 +00:00
..
main	Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds	2016-05-20 20:27:52 +00:00
templates	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
test	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
universal/conf	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00