Merge branch 'develop' of https://github.com/gcarq/freqtrade into develop

2018-01-02 15:15:44 +01:00
parent e24f4243a9 0c11d4443f
commit 5fe416c1ce
37 changed files with 2086 additions and 406 deletions
--- a/config.json.example
+++ b/config.json.example
@@ -2,6 +2,7 @@
    "max_open_trades": 3,
    "stake_currency": "BTC",
    "stake_amount": 0.05,
+    "fiat_display_currency": "USD",
    "dry_run": false,
    "minimal_roi": {
        "40":  0.0,
@@ -34,6 +35,9 @@
            "BTC_POWR",
            "BTC_ADA",
            "BTC_XMR"
+        ],
+        "pair_blacklist": [
+            "BTC_DOGE"
        ]
    },
    "experimental": {