bigbluebutton-Github/bigbluebutton-html5/imports/ui/components/video-dock
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
..
video-menu Removed router for video-menu 2017-12-08 16:53:28 +00:00
component.jsx Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-development-reconnect-issues 2017-12-20 17:20:56 -02:00
container.jsx Moved video-dock and video-menu collection communication to services 2017-12-08 16:38:51 +00:00
service.js Moved video-dock and video-menu collection communication to services 2017-12-08 16:38:51 +00:00
styles.scss Removed router for video-menu 2017-12-08 16:53:28 +00:00