Martyn Inglis b213c3fa3c Merge branch 'master' into celery-jobs ...

Conflicts:
	tests/app/conftest.py

2016-02-25 15:10:39 +00:00

..

app

Merge branch 'master' into celery-jobs

2016-02-25 15:10:39 +00:00

__init__.py

bumped client version

2016-02-09 18:48:02 +00:00

conftest.py

I have an issue with the test, not sure why?

2016-02-17 17:48:23 +00:00