Merging develop into master

ethereum · Dec 15, 2016 · d2f6d0d · d2f6d0d
2 parents f5552ab + 3a5bb06
commit d2f6d0d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "numeral": "^1.5.3",
     "os-timesync": "^1.0.6",
     "semver": "^5.1.0",
-    "solc": "^0.4.5",
+    "solc": "0.4.6",
     "typescript": "^1.7.3",
     "underscore": "^1.8.3",
     "underscore-deep-extend": "^1.1.5",

diff --git a/yarn.lock b/yarn.lock
@@ -3895,7 +3895,7 @@ [email protected]:
   dependencies:
     hoek "2.x.x"
 
-solc@^0.4.5:
+[email protected].6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.6.tgz#afa929a1ceafc0252cfbb4217c8e2b1dab139db7"
   dependencies: