Martyn Inglis 886b206d63 Merge branch 'master' into email-templates ...

Conflicts:
	app/user/rest.py
	tests/app/user/test_rest.py

2016-02-22 13:12:24 +00:00

..

app

Merge branch 'master' into email-templates

2016-02-22 13:12:24 +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