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
..
bin	Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds	2016-05-18 15:14:04 +00:00
cron.daily	Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds	2016-05-18 15:14:04 +00:00
record	added chrome plugin patch for test recording	2010-11-19 05:04:16 +00:00
slides	moving these configuration files into git	2010-09-18 23:24:04 +00:00
web	Merge branch 'bbb-web_fix-maxParticipants-by-tracking-joins' of https://github.com/jfederico/bigbluebutton into jfederico-bbb-web_fix-maxParticipants-by-tracking-joins	2016-05-20 15:28:19 +00:00
bigbluebutton-release	Move from 1.0-RC to 1.0	2016-05-14 09:45:26 -04:00
check-localization-keys.txt	remove and add strings for the localization file	2013-05-27 17:56:48 -05:00