Merge branch 'master' into develop

DeFiCh · Jul 1, 2020 · b09590e · b09590e
2 parents a5c8024 + e6ee3bd
commit b09590e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ For more information:
 - Visit the [DeFi Blockchain website](https://defichain.io)
 - Read our [white paper](https://defichain.io/white-paper/)
 
-Downloadable binaries are available from the [GitHub Releases](https://github.com/DeFiCh/ain/releases) page. 
+Official binaries are available from the [GitHub Releases](https://github.com/DeFiCh/ain/releases) page. 
 
 ### Bitcoin Core
 

diff --git a/contrib/dockerfiles/dockerhub/x86_64-pc-linux-gnu.dockerfile b/contrib/dockerfiles/dockerhub/x86_64-pc-linux-gnu.dockerfile
@@ -17,3 +17,4 @@ USER defi:defi
 CMD [ "/app/bin/defid" ]
 
 EXPOSE 8555 8554 18555 18554 19555 19554
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,4 @@ USER defi:defi
		CMD [ "/app/bin/defid" ]

		EXPOSE 8555 8554 18555 18554 19555 19554