Merge remote-tracking branch 'origin/dev' into storage_cleanup (3183f4c8) · Commits · Hexang 息壤平台 / persona · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

persona
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

3183f4c8

Commit 3183f4c8 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/dev' into storage_cleanup

Conflicts:
	browserid/static/dialog/resources/browserid-identities.js

parents 73e35ca0 5107abe1

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

README.md 3 additions, 3 deletions

README.md
browserid/lib/ca.js 12 additions, 8 deletions

browserid/lib/ca.js
browserid/lib/wsapi.js 5 additions, 1 deletion

browserid/lib/wsapi.js
browserid/static/dialog/resources/browserid-identities.js 14 additions, 2 deletions

browserid/static/dialog/resources/browserid-identities.js
browserid/tests/ca-test.js 3 additions, 1 deletion

browserid/tests/ca-test.js
package.json 3 additions, 2 deletions

package.json
verifier/lib/certassertion.js 30 additions, 30 deletions

verifier/lib/certassertion.js

with 70 additions and 47 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 sign in to comment