Anton ceeb98dda9 Fix conflicts		2018-05-03 11:16:29 +03:00
..
__init__.py	Fix conflicts	2018-05-03 11:16:29 +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