Merge branch 'master' into es6

ethereumjs · Aug 7, 2017 · f214fea · f214fea
2 parents c95c235 + 338ee90
commit f214fea
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -125,7 +125,7 @@
     "browserify": "^14.0.0",
     "contributor": "^0.1.25",
     "coveralls": "^2.11.4",
-    "documentation": "^3.0.4",
+    "documentation": "^4.0.0",
     "istanbul": "^0.4.1",
     "karma": "^1.3.0",
     "karma-browserify": "^5.0.0",