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

Merge remote branch 'origin/dev' into start_unit_tests

Conflicts:
	browserid/static/js/browserid.js
parents dc025fbe 996ce93f
No related branches found
No related tags found
Loading
Showing
with 578 additions and 184 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