Merge branch 'development' into documentation and resolved conflicts

RiseVision · Aug 2, 2018 · 608936e · 608936e
2 parents 9a9180f + 0d30ea0
commit 608936e
Show file tree

Hide file tree

Showing 22 changed files with 7,464 additions and 214 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,5 +25,3 @@ backup.tar
 blockchain.db.gz
 dist/
 .nyc_output/
-
-package-lock\.json
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Rise-node version 1.0.0
+## Rise-node version 1.1.1
 
 # RISE
 [![Build Status](https://travis-ci.org/RiseVision/rise-node.svg?branch=development)](https://travis-ci.org/RiseVision/rise-node) [![Coverage Status](https://coveralls.io/repos/github/RiseVision/rise-node/badge.svg?branch=development)](https://coveralls.io/github/RiseVision/rise-node?branch=development)