Merge branch 'dev' into FSM

# Conflicts: # depends/packages/zeromq.mk # src/assetchains.json
2019-02-27 04:31:00 -11:00
parent 1da0a1710d
commit 53e66f1170
11 changed files with 96 additions and 11 deletions
--- a/src/assetchains.json
+++ b/src/assetchains.json
@@ -238,7 +238,13 @@
   "addnode": [
     "51.255.195.65",
     "217.182.129.38",
-     "95.216.150.177"
-   ]
-}
+     "37.187.225.231"
+    ]
+  },
+  {
+   "ac_name": "ILN",
+   "ac_supply": "10000000000",
+   "ac_cc": "2",
+   "addnode": ["51.75.122.83"]
+ }
 ]