perroned 7ca23e44cc Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as bigbluebutton-html5/imports/startup/server/EventQueue.js bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx		2016-09-14 19:30:07 +00:00
..
client	HTML5 - Changes config organization and all files dependant on config files	2016-08-17 08:48:03 -07:00
server	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-09-14 19:30:07 +00:00