Merge remote-tracking branch 'origin/redirect2' into redirect2 · alphagov/govuk-prototype-kit@e35f802 · GitHub

Commit

Merge remote-tracking branch 'origin/redirect2' into redirect2

Browse files

Conflicts:
	docs/views/examples/branch/director.html
	docs/views/examples/branching.html
	lib/utils.js

Loading branch information

tsmorgan committed Apr 18, 2017

2 parents 7089065 + 929e5d5 commit e35f802