whitelist conflict resolved with develop branch

This commit is contained in:
misagh
2018-11-02 18:59:31 +01:00
16 changed files with 351 additions and 468 deletions

View File

@@ -1,5 +1,5 @@
ccxt==1.17.411
SQLAlchemy==1.2.12
ccxt==1.17.455
SQLAlchemy==1.2.13
python-telegram-bot==11.1.0
arrow==0.12.1
cachetools==2.1.0
@@ -12,7 +12,7 @@ scipy==1.1.0
jsonschema==2.6.0
numpy==1.15.3
TA-Lib==0.4.17
pytest==3.9.2
pytest==3.9.3
pytest-mock==1.10.0
pytest-asyncio==0.9.0
pytest-cov==2.6.0