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

Merge remote branch 'origin/dev' into start_unit_tests

Moved the assertion generation into BrowserIDIdentities. Adding tests for this.

Conflicts:
	browserid/static/dialog/controllers/dialog_controller.js
parents 6f0334d6 5b0ecf7b
No related branches found
No related tags found
No related merge requests found
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