conflict with develop resolved

This commit is contained in:
misagh
2019-03-14 07:56:21 +01:00
18 changed files with 299 additions and 278 deletions

View File

@@ -203,6 +203,7 @@ CONF_SCHEMA = {
'uniqueItems': True
},
'outdated_offset': {'type': 'integer', 'minimum': 1},
'markets_refresh_interval': {'type': 'integer'},
'ccxt_config': {'type': 'object'},
'ccxt_async_config': {'type': 'object'}
},