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
..
actions-bar	Change Auth service to be a singleton class	2016-07-11 13:45:24 +00:00
app	Fix conflicts	2016-07-12 14:02:48 +00:00
button	Fix React warnings for unknown props	2016-07-11 20:10:55 +00:00
chat	Remove unused import/prop	2016-07-12 14:04:39 +00:00
deskshare	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-07-22 19:20:00 +00:00
icon	Add new component button and some basic styles	2016-05-20 10:37:19 -03:00
loader	Merge after git conflict/lost object	2016-07-11 12:35:08 +00:00
media	Hide webcam component	2016-07-11 10:13:55 -03:00
modals	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-07-22 19:20:00 +00:00
nav-bar	Change Auth service to be a singleton class	2016-07-11 13:45:24 +00:00
polling	Merge after git conflict/lost object	2016-07-11 12:35:08 +00:00
user-avatar	Fix muted status dash sizing	2016-07-11 18:20:24 +00:00
user-list	Fix conflicts	2016-07-12 14:02:48 +00:00
video-dock	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07:00
whiteboard	Fixes Cursor propTypes	2016-07-18 08:30:04 -07:00