prlanzarin f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu ... Conflicts: bigbluebutton-html5/imports/startup/client/base.jsx bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx bigbluebutton-html5/imports/ui/components/app/container.jsx bigbluebutton-html5/imports/ui/components/screenshare/service.js bigbluebutton-html5/imports/ui/components/video-dock/component.jsx bigbluebutton-html5/imports/ui/components/video-dock/container.jsx bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js		2017-11-11 03:41:37 +00:00
..
sharedWebcam.js	Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu	2017-11-11 03:41:37 +00:00
unsharedWebcam.js	Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu	2017-11-11 03:41:37 +00:00