Skip to content
Snippets Groups Projects
Commit 7065801c authored by Lloyd Hilaiel's avatar Lloyd Hilaiel
Browse files

merge fix for mismatch between client and server times: closes #329

Conflicts:
	browserid/static/dialog/resources/browserid-identities.js
	browserid/static/dialog/resources/browserid-network.js
	browserid/static/dialog/test/qunit/browserid-network_test.js
	browserid/views/developers.ejs
parents 4a89fcaf 75f909a5
No related branches found
No related tags found
Loading
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