Richard Alam 1e8d7a5229 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into try-to-cleanup-connection ... Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala		2016-10-21 19:36:07 +00:00
..
fs_conf_files/conf	subscribe for -DESKSHARE in meeting, adjust for liveMeeting	2016-07-20 21:39:36 +00:00
project
src	- remove defunct connection when client auto-reconnects.	2016-10-20 15:08:58 +00:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01:00
build.sbt	Upgrade commons-codec dependency version to 1.10	2016-10-05 17:29:37 +01:00