Skip to content
Snippets Groups Projects
Commit a8e6c915 authored by Austin King's avatar Austin King
Browse files

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

Conflicts:
	lib/configuration.js
	resources/static/dialog/views/pick_email.ejs
	resources/static/shared/renderer.js
parents a677a06f 18dc9ef6
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 227 additions and 50 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