Merge remote-tracking branch 'upstream/develop' into StopLossSupport

2018-05-19 12:58:56 -07:00
parent 60b2b68bc3 b0536dba0b
commit b01e9b3f2f
23 changed files with 429 additions and 151 deletions
--- a/config.json.example
+++ b/config.json.example
@@ -3,6 +3,7 @@
    "stake_currency": "BTC",
    "stake_amount": 0.05,
    "fiat_display_currency": "USD",
+    "ticker_interval" : "5m",
    "dry_run": false,
    "trailing_stop": {
        "positive" : 0.005