Oleksandr Zhurbenko d49efd548d Fixed shape's display ... The version went missing during the switch to 2.0		2017-07-17 16:47:18 -07:00
..
.meteor	Upgrade Meteor to 1.5	2017-07-04 09:40:02 -03:00
client	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-07-17 16:01:05 -07:00
imports	Fixed shape's display	2017-07-17 16:47:18 -07:00
log
private	Merge remote-tracking branch 'upstream/master' into merge-master-mconf	2017-07-17 13:33:45 -03:00
public	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality	2017-06-07 13:29:35 -07:00
server	Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages	2017-07-17 16:54:37 -03:00
tests/webdriverio	Make sure the acceptance tests that involve keyboard are not executed on Firefox	2017-06-05 23:42:33 +00: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	Update package-lock.json	2017-06-29 13:11:53 -03:00
package.json	Use flat package on mongo upsert	2017-06-29 08:54:19 -03:00