bigbluebutton-Github/labs/bbb-webrtc-sfu/lib/mcs-core
Lucas Zawacki 113aca16a2 Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-development-reconnect-issues
Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	labs/bbb-webrtc-sfu/lib/video/VideoManager.js
	labs/bbb-webrtc-sfu/lib/video/video.js
2017-12-20 17:20:56 -02:00
..
lib Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-development-reconnect-issues 2017-12-20 17:20:56 -02:00
CoreProcess.js Renaming node-bbb-apps to bbb-webrtc-sfu 2017-11-11 01:44:50 +00:00