perroned c057111367 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 ... Conflicts: bigbluebutton-client/resources/config.xml.template bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as		2016-08-04 18:23:45 +00:00
..
project	- move bbb-apps-akka out of labs	2015-06-09 18:49:47 +00:00
scala	Merge branch 'breakout-rooms-porto-algre-2015' of https://github.com/riadvice/bigbluebutton into breakout-rooms-porto-algre-2015	2016-02-01 16:12:06 +00:00
src	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-08-04 18:23:45 +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