perroned 0a12d2f6ce Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 ... Conflicts: bigbluebutton-html5/imports/startup/server/EventQueue.js		2016-12-01 19:19:58 +00:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-12-01 19:19:58 +00:00
config.xml.template	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-12-01 19:19:58 +00:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00