Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev

merge
2018-11-28 10:03:32 +08:00
parent 805ea3594f 5d5da38a6f
commit 13853833a8
567 changed files with 42478 additions and 10199 deletions
--- a/src/assetchains.json
+++ b/src/assetchains.json
@@ -118,7 +118,8 @@
  },
  {
    "ac_name": "EQL",
-    "ac_supply": "500000000"
+    "ac_supply": "500000000",
+    "ac_ccactivate": "205000"
  },
  {
    "ac_name": "ZILLA",