bigbluebutton-Github/bbb-common-message
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
..
project - create a common message project 2015-06-10 15:53:07 +00:00
src Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
.gitignore - create a common message project 2015-06-10 15:53:07 +00:00
build.sbt - add Jackson Json dependencies 2017-05-09 14:19:22 -07:00
deploy.sh - some util scripts 2017-06-16 10:07:47 -07:00
README.md - remove messages from bbb-apps red5 2015-06-10 17:11:36 +00:00