f43b77c19f
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 |
||
---|---|---|
.. | ||
.meteor | ||
client | ||
imports | ||
log | ||
private | ||
public | ||
server | ||
tests/webdriverio | ||
.eslintignore | ||
.eslintrc.js | ||
.gitignore | ||
package-lock.json | ||
package.json | ||
transifex.sh |