Merge branch 'develop' of https://github.com/ethereum/mist into isola…

…tedPreloader
ethereum · Jul 4, 2017 · 057a5b5 · 057a5b5
2 parents 62021dc + 5bc1e9f
commit 057a5b5
Show file tree

Hide file tree

Showing 2 changed files with 4,511 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "minimist": "^1.2.0",
     "mocha": "^3.2.0",
     "optimist": "^0.6.1",
-    "require-dir": "^0.3.1",
+    "require-dir": "^0.3.2",
     "run-sequence": "^1.2.1",
     "semver-compare": "^1.0.0",
     "shelljs": "^0.7.7",