Merge branch 'develop' of https://github.com/irisnet/irishub into jia…

…cheng/gov
irisnet · Sep 12, 2018 · 26cf64d · 26cf64d
2 parents 4c30b28 + f8e8cf4
commit 26cf64d
Show file tree

Hide file tree

Showing 25 changed files with 3,222 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,8 @@ vendor
 .DS_Store
 .idea
 build/
-*.out
+.out
+docs/.vuepress/dist/
+node_modules/
+package.json
+yarn.lock