Lucas Zawacki 1e514aad04 Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu ... Removed several variables that were in this.state to this in the html5 video-dock component Conflicts: bigbluebutton-html5/imports/ui/components/video-dock/component.jsx		2017-12-15 13:47:03 -02:00
..
config	Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu	2017-11-11 03:41:37 +00:00
locales	Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu	2017-12-15 13:47:03 -02:00