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
..
server	minor edit to handle voice events	2016-05-25 16:32:23 -03:00
index.js	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-07-22 19:20:00 +00:00