Merge remote-tracking branch 'origin/master'

This commit is contained in:
Romain Beaumont 2017-06-19 15:50:29 +02:00
commit aa96950ac5
No known key found for this signature in database
GPG Key ID: DB60E388B3BCF286

View File

@ -33,7 +33,7 @@
"minecraft-wrap": "^1.0.0", "minecraft-wrap": "^1.0.0",
"mocha": "^3.0.2", "mocha": "^3.0.2",
"power-assert": "^1.0.0", "power-assert": "^1.0.0",
"require-self": "^0.1.0" "require-self": "^0.2.1"
}, },
"dependencies": { "dependencies": {
"buffer-equal": "^1.0.0", "buffer-equal": "^1.0.0",