Martyn Inglis 6e3759eb1f Merge branch 'master' into new-api-for-deleting-templates ...

Conflicts:
	app/main/views/templates.py

2016-08-24 11:05:19 +01:00

..

app

Merge pull request #894 from alphagov/fix-research-mode-toggle

2016-08-23 14:27:02 +01:00

non_spreadsheet_files

Handle files that can’t be interpreted as spreadsheets

2016-05-15 22:11:01 +01:00

spreadsheet_files

Accept common spreadsheet formats, not just CSV

2016-05-15 22:10:58 +01:00

__init__.py

Using new endpoint for template statistics

2016-08-22 16:25:35 +01:00

conftest.py

Merge branch 'master' into new-api-for-deleting-templates

2016-08-23 09:31:05 +01:00