Merge branch 'master' of github.com:nujabes403/blockchains-tools

# Conflicts: # package-lock.json
nujabes403 · Nov 7, 2019 · 4b37722 · 4b37722
2 parents c9c001b + 1edc4bb
commit 4b37722
Show file tree

Hide file tree

Showing 2 changed files with 2,087 additions and 1,926 deletions.
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "ismobilejs": "^0.5.1",
     "json-format": "^1.0.1",
     "keccak256": "^1.0.0",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.13",
     "markdown-loader": "^5.0.0",
     "marked": "^0.6.0",
     "query-string": "^6.4.2",