Lucas Zawacki 06f8b56a82 Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-video-media-flow ... Conflicts: bigbluebutton-html5/imports/ui/components/video-dock/component.jsx		2017-12-20 18:43:33 -02:00
..
bbb	Capture several errors and crashes in client and bbb-webrtc-sfu	2017-12-14 16:42:13 -02:00
connection-manager	Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu	2017-12-05 17:58:58 -02:00
mcs-core	Use more readable uids for bbb-webrtc-sfu	2017-12-20 18:23:56 -02:00
screenshare	Capture several errors and crashes in client and bbb-webrtc-sfu	2017-12-14 16:42:13 -02:00
video	Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-video-media-flow	2017-12-20 18:43:33 -02:00
h264-sdp.js	Renaming node-bbb-apps to bbb-webrtc-sfu	2017-11-11 01:44:50 +00:00
media-handler.js	Added voiceBridge parameter to akka-bbb-transcode	2017-11-21 14:11:59 +00:00
websocket.js	Renaming node-bbb-apps to bbb-webrtc-sfu	2017-11-11 01:44:50 +00:00