bigbluebutton-Github/bigbluebutton-html5/imports/api/screenshare/server
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
..
handlers Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
modifiers Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
eventHandlers.js Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
index.js Moved files up to api/ 2017-10-11 18:09:35 -07:00
methods.js Moved files up to api/ 2017-10-11 18:09:35 -07:00
publishers.js Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00