BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f43b77c19f
bigbluebutton-Github/bigbluebutton-html5/imports/ui/components/media
History
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
..
component.jsx remove .scss extension and changed path 2017-10-11 14:54:00 -03:00
container.jsx Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
service.js Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
styles.scss PR review fixes 2017-09-06 12:36:52 -07:00