Martyn Inglis 09b3313ce3 Merge branch 'master' into primary-provider ...

Conflicts:
	tests/app/dao/test_provider_rates_dao.py

2016-05-11 14:04:15 +01:00

..

app

Merge branch 'master' into primary-provider

2016-05-11 14:04:15 +01:00

__init__.py

Update python client to version 1.0.0.

2016-05-04 16:08:23 +01:00

conftest.py

Added tests to ensure pick correct provider from the database in the celery tasks.

2016-05-11 14:03:12 +01:00