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
..
project	- restructure bbb-fsesl-client	2015-06-10 20:13:40 +00:00
src	Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds	2016-05-18 15:14:04 +00:00
.gitignore	- restructure bbb-fsesl-client	2015-06-10 20:13:40 +00:00
build.gradle	- rename project	2015-06-10 19:33:25 +00:00
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
pom.xml	- rename project	2015-06-10 19:33:25 +00:00