bigbluebutton-Github/bigbluebutton-html5
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
..
.meteor Initial packages update 2017-10-23 17:09:40 -07:00
client Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
imports Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
log
private Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
public Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
server Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
tests/webdriverio Added an instance of the mobile Chrome (iPhone 6). 2017-08-28 11:52:15 -04:00
.eslintignore Improve ESLint rules 2017-06-02 20:42:13 +00:00
.eslintrc.js Add missing packages and fix formating 2017-06-05 13:26:47 +00:00
.gitignore Add missing configuration file 2017-02-06 19:14:48 +00:00
package-lock.json Breaking proptypes validation, sorry, any questions to @oswaldoacauan 2017-11-01 13:11:35 -07:00
package.json Handling HTML5 screensharing stop 2017-11-06 15:39:55 +00:00
transifex.sh Indentations cleanup. 2017-10-21 21:30:24 -04:00