Tainan Felipe 1469791bc7 solve merge issues		2017-10-23 13:50:31 -02:00
..
.meteor	Update Meteor to 1.5.1	2017-07-31 16:19:13 -03:00
client	Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter	2017-10-11 11:46:16 -03:00
imports	solve merge issues	2017-10-23 13:50:31 -02:00
log
private	Merge pull request #4505 from OZhurbenko/merge-2.0-1.1-api	2017-10-12 13:45:46 -03:00
public	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-08-01 13:49:46 -07: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
package-lock.json	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x	2017-08-31 09:49:59 -03:00
package.json	Fix silent changes caused by the old pr revert	2017-10-02 11:12:58 -03:00
transifex.sh	add script to pull translation from transifex	2017-08-02 11:11:33 -07:00