Merge branch 'develop' into money_mgt

2018-10-23 19:33:13 +02:00
parent 67ace0a76c a063397447
commit 25daf3a0f7
31 changed files with 206 additions and 115 deletions
--- a/freqtrade/constants.py
+++ b/freqtrade/constants.py
@@ -165,7 +165,9 @@ CONF_SCHEMA = {
                    },
                    'uniqueItems': True
                },
-                'outdated_offset': {'type': 'integer', 'minimum': 1}
+                'outdated_offset': {'type': 'integer', 'minimum': 1},
+                'ccxt_config': {'type': 'object'},
+                'ccxt_async_config': {'type': 'object'}
            },
            'required': ['name', 'key', 'secret', 'pair_whitelist']
        },