Lucas Zawacki 4e2833aa07 Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu ... Conflicts: bigbluebutton-html5/imports/ui/components/video-dock/component.jsx		2017-12-05 17:58:58 -02:00
..
components	Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu	2017-12-05 17:58:58 -02:00
services	Fixes settings service	2017-11-07 14:21:43 -02:00
stylesheets	bug fixes; CSS animation package update; updated package-lock; fixed permissions;	2017-10-25 16:11:06 -07:00