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

Merge branch 'design' of github.com:mozilla/browserid into design

Conflicts:
	browserid/app.js
	browserid/static/js/browserid.js
parents ccc976fa f0c8fc4f
No related branches found
No related tags found
Loading
Showing
with 1120 additions and 99 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment