Rebecca Law 11ac7b2874 Merge branch 'master' into notification-created-status ...

Conflicts:
	app/dao/notifications_dao.py

2016-06-22 16:15:56 +01:00

..

app

Merge branch 'master' into notification-created-status

2016-06-22 16:15:56 +01:00

__init__.py

Update python client to version 1.0.0.

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

conftest.py

Make update notification status transcational.

2016-05-27 12:09:36 +01:00