Rebecca Law 584ad26a1a Merge branch 'master' into fix-password-changed-at ...

Conflicts:
	tests/conftest.py

2016-06-28 11:02:53 +01:00

..

app

send key_type = normal when creating api keys

2016-06-27 12:02:16 +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

Merge pull request #634 from alphagov/research-mode

2016-06-02 12:00:39 +01:00

conftest.py

Merge branch 'master' into fix-password-changed-at

2016-06-28 11:02:53 +01:00