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

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

Conflicts:
	resources/views/dialog_layout.ejs
	resources/views/test.ejs
	scripts/compress.sh
parents a8e6c915 04145c9e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 63 additions and 450 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