conflict with develop resolved

2019-03-14 07:56:21 +01:00
parent 0bcf50f1b5 2959600f52
commit 9a226ec7e6
18 changed files with 299 additions and 278 deletions
--- a/config_full.json.example
+++ b/config_full.json.example
@@ -78,7 +78,8 @@
        "pair_blacklist": [
            "DOGE/BTC"
        ],
-        "outdated_offset": 5
+        "outdated_offset": 5,
+        "markets_refresh_interval": 60
    },
    "edge": {
        "enabled": false,