Skip to content
This repository was archived by the owner on Sep 5, 2020. It is now read-only.

Commit d2f6d0d

Browse files
committed
Merging develop into master
2 parents f5552ab + 3a5bb06 commit d2f6d0d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"numeral": "^1.5.3",
2828
"os-timesync": "^1.0.6",
2929
"semver": "^5.1.0",
30-
"solc": "^0.4.5",
30+
"solc": "0.4.6",
3131
"typescript": "^1.7.3",
3232
"underscore": "^1.8.3",
3333
"underscore-deep-extend": "^1.1.5",

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3895,7 +3895,7 @@ sntp@1.x.x:
38953895
dependencies:
38963896
hoek "2.x.x"
38973897

3898-
solc@^0.4.5:
3898+
solc@0.4.6:
38993899
version "0.4.6"
39003900
resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.6.tgz#afa929a1ceafc0252cfbb4217c8e2b1dab139db7"
39013901
dependencies:

0 commit comments

Comments
 (0)