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
..
api	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-07-22 19:20:00 +00:00
locales	Add tip for unread chat messages	2016-07-05 13:34:13 +00:00
startup	Merge after git conflict/lost object	2016-07-11 12:34:58 +00:00
ui	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-07-22 19:20:00 +00:00
utils	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07:00