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
..
bbb-redis-messaging.xml	- add ping/pong message between different components to verfiy that we have working path	2015-08-20 20:44:40 +00:00
bbb-redis-pool.xml	- add ping/pong message between different components to verfiy that we have working path	2015-08-20 20:44:40 +00:00
doc-conversion.xml	- change how we process upload presentation. Before, an uploaded presentation consumes all of the	2016-01-21 17:24:13 +00:00
resources.groovy	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
resources.xml	Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds	2016-05-20 20:27:52 +00:00
turn-stun-servers.xml	Use configured stun/turn servers when making webrtc call	2015-02-17 12:00:04 -05:00