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
..
components	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-09-14 19:30:07 +00:00
services	HTML5 Dropdown - fixed warnings and added style	2016-09-07 12:17:15 -07:00
stylesheets	Fixes slide control PR comments	2016-08-05 11:39:24 -07:00