Rebecca Law 29ddad60e7 Merge branch 'master' into forgot-password ...

Conflicts:
	app/main/views/two_factor.py

2016-03-08 15:03:25 +00:00

..

app

Merge branch 'master' into forgot-password

2016-03-08 15:03:25 +00:00

__init__.py

Merge pull request #236 from alphagov/show-completion-of-job

2016-03-08 08:55:59 +00:00

conftest.py

Merge branch 'master' into forgot-password

2016-03-08 15:03:25 +00:00