Martyn Inglis 1e054ec698 Merge branch 'master' into do-not-write-test-data-to-the-history-table ...

Conflicts:
	app/user/rest.py

2016-12-19 16:47:54 +00:00

..

__init__.py

Remove the view packages

2016-01-14 16:13:27 +00:00

rest.py

Merge branch 'master' into do-not-write-test-data-to-the-history-table

2016-12-19 16:47:54 +00:00