Merge branch 'develop' of https://github.com/ether-camp/ethereum-harmony

into develop
ether-camp · Oct 17, 2018 · a5ba466 · a5ba466
2 parents 3ab4cdd + 2fbd9d7
commit a5ba466
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ https://www.youtube.com/watch?v=leaAMTgjvxg
 Navigate to web view `http://localhost:8080`
 JSON-RPC is available at either `http://localhost:8545/rpc` or `http://localhost:8545`
 
-In order to provide ability to disable unneeded features, any of app modules could be disabled: web, contracts, rpc. Check [configuration](https://github.com/ether-camp/ethereum-harmony/blob/develop/src/main/resources/user.conf) for more info.
+In order to provide ability to disable unneeded features, any of app modules could be disabled: web, contracts, rpc. Check [configuration](https://github.com/ether-camp/ethereum-harmony/blob/develop/src/main/resources/harmony.conf#L7-L32) for more info.
 
 Run RPC only: `gradlew runMain -PrpcOnly`
 

diff --git a/build.gradle b/build.gradle
@@ -99,7 +99,7 @@ dependencies {
     compile "org.ethereum:solcJ-all:0.4.19"                   // Solidity Compiler win/mac/linux binaries
 
     // don't forget to adjust {ethereumJ.version} in application.properties
-    compile ("org.ethereum:ethereumj-core:1.9.0-SNAPSHOT") {
+    compile ("org.ethereum:ethereumj-core:1.10.0-SNAPSHOT") {
         changing = true
 
         exclude group: "log4j"