Skip to content
Snippets Groups Projects
Commit 281ada60 authored by Shane Tomlinson's avatar Shane Tomlinson
Browse files

Merge branch 'dev' into design 

Conflicts:
	browserid/static/css/style.css
	browserid/static/js/browserid.js
	browserid/views/layout.ejs
parents 13cb395f a0a424a5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 442 additions and 406 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment