Merge pull request #51 from dappforce/develop

Merge develop into master branch
dappforce · Aug 10, 2020 · 952aef3 · 952aef3
2 parents 7485d2d + e88191f
commit 952aef3
Show file tree

Hide file tree

Showing 86 changed files with 9,213 additions and 4,337 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
+**/customSpec.json
+
 # IDE's config
 **/.idea
 **/.vscode