Merge branch 'develop' into timeframe

2020-06-02 15:56:34 +03:00
parent b106c88630 4c82f127b3
commit 64881a94e2
28 changed files with 238 additions and 61 deletions
--- a/freqtrade/templates/base_config.json.j2
+++ b/freqtrade/templates/base_config.json.j2
@@ -53,6 +53,15 @@
        "token": "{{ telegram_token }}",
        "chat_id": "{{ telegram_chat_id }}"
    },
+    "api_server": {
+        "enabled": false,
+        "listen_ip_address": "127.0.0.1",
+        "listen_port": 8080,
+        "verbosity": "info",
+        "jwt_secret_key": "somethingrandom",
+        "username": "",
+        "password": ""
+    },
    "initial_state": "running",
    "forcebuy_enable": false,
    "internals": {