Richard Alam 16499b3da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi ... Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala akka-bbb-fsesl/build.sbt bigbluebutton-web/build.gradle		2016-01-07 22:58:04 +00:00
..
project	- rename to reflect this is our esl client to FS	2015-06-09 19:03:02 +00:00
src	- user internal user id for user in the voice conf	2015-09-30 18:55:17 +00:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi	2016-01-07 22:58:04 +00:00