perroned 0e3096d00d Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2		2016-08-05 18:45:59 +00:00
..
fs_conf_files/conf	subscribe for -DESKSHARE in meeting, adjust for liveMeeting	2016-07-20 21:39:36 +00:00
project	- rename to reflect this is our esl client to FS	2015-06-09 19:03:02 +00:00
src	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-08-05 18:45:59 +00:00
.gitignore	Improve .gitignore files with better patterns.	2015-07-09 16:13:09 +01: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