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

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

Conflicts:
	resources/static/pages/signup.js
	resources/static/shared/network.js
parents d30148ba 93d7bae4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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