Skip to content
Snippets Groups Projects
Commit 113aca16 authored by Lucas Zawacki's avatar Lucas Zawacki
Browse files

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
parents 2e3ea4e4 2fb291ce
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 118 additions and 49 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net