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
..
captions	Changed CC's split limit to 1,000 characters	2016-08-20 19:57:28 -07:00
chat	Fixed merge conflicts	2016-08-23 16:45:28 -07:00
common/server	Fixed merge conflicts	2016-08-23 16:45:28 -07:00
cursor	Changed update to upsert for the cursor updates	2016-08-20 20:30:38 -07:00
deskshare	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-09-14 19:30:07 +00:00
FontControl	Changing structure to /api/list/index.js	2016-05-12 14:04:00 -05:00
meetings	omit hiredis package; cleanup	2016-08-29 21:34:03 +00:00
phone	Fixed merge conflicts	2016-08-23 16:45:28 -07:00
polls	HTML5 - Changes config organization and all files dependant on config files	2016-08-17 08:48:03 -07:00
presentations	HTML5 - Changes config organization and all files dependant on config files	2016-08-17 08:48:03 -07:00
shapes	Changed 'let' to 'const' where it was possible and adjusted imports	2016-06-27 14:48:46 -07:00
slides	fix bug related to change presentation	2016-08-25 15:57:31 +00:00
users	Fixed merge conflicts	2016-08-23 16:45:28 -07:00
verto	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-09-14 19:30:07 +00:00