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/strategy/init.py
+++ b/freqtrade/strategy/init.py
@@ -3,7 +3,8 @@ import sys
 from copy import deepcopy

 from freqtrade.strategy.interface import IStrategy
-
+# Import Default-Strategy to have hyperopt correctly resolve
+from freqtrade.strategy.default_strategy import DefaultStrategy  # noqa: F401

 logger = logging.getLogger(__name__)