Merge branch 'develop' into test_coverage

2018-01-20 21:24:28 +01:00
parent cf266a67ad d2371b5bac
commit e94e6292e9
20 changed files with 448 additions and 159 deletions
--- a/freqtrade/tests/conftest.py
+++ b/freqtrade/tests/conftest.py
@@ -27,6 +27,7 @@ def default_conf():
        "stake_currency": "BTC",
        "stake_amount": 0.001,
        "fiat_display_currency": "USD",
+        "ticker_interval": "5",
        "dry_run": True,
        "minimal_roi": {
            "40": 0.0,