perroned 2a23778ea9 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton ... Conflicts: bigbluebutton-client/resources/config.xml.template bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as bigbluebutton-html5/imports/api/verto/index.js bigbluebutton-html5/imports/ui/components/deskshare/service.js		2016-07-22 19:20:00 +00:00
..
component.jsx	Fixes audio permission, render tag	2016-06-01 15:56:12 +00:00
container.jsx	Remove unnecessary extension on imports	2016-05-20 10:46:30 -03:00
service.js	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-07-22 19:20:00 +00:00