Merge branch 'master' into greenkeeper/uglify-js-3.3.1
commit
bd5a14bbbb
|
@ -84,7 +84,7 @@
|
|||
"js-beautify": "^1.7.3",
|
||||
"jshint": "^2.9.4",
|
||||
"json-schema-test": "^2.0.0",
|
||||
"karma": "^1.0.0",
|
||||
"karma": "^2.0.0",
|
||||
"karma-chrome-launcher": "^2.0.0",
|
||||
"karma-mocha": "^1.1.1",
|
||||
"karma-phantomjs-launcher": "^1.0.0",
|
||||
|
|
Loading…
Reference in New Issue