Anton 2bfce64e6a Fix conflicts

2018-05-04 13:38:51 +03:00

..

__init__.py

Fix conflicts

2018-05-04 13:38:51 +03:00

backtesting.py

Merge branch 'develop' into feat/objectify-ccxt

2018-05-02 22:49:55 +02:00

hyperopt.py

Merge branch 'develop' into feat/objectify-ccxt

2018-05-02 22:49:55 +02:00