Merge branch 'master' into db (256b8263) · 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

256b8263

Commit 256b8263 authored 13 years ago by Lloyd Hilaiel

Downloads
- Plain Diff

Merge branch 'master' into db

(resolved) Conflicts:
	browserid/lib/db.js
	browserid/lib/wsapi.js

parents 34340f8b 98795f13

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

browserid/app.js 51 additions, 50 deletions

browserid/app.js
browserid/lib/db.js 12 additions, 11 deletions

browserid/lib/db.js
browserid/lib/email.js 17 additions, 16 deletions

browserid/lib/email.js
browserid/lib/httputils.js 5 additions, 5 deletions

browserid/lib/httputils.js
browserid/lib/secrets.js 3 additions, 2 deletions

browserid/lib/secrets.js
browserid/lib/webfinger.js 5 additions, 4 deletions

browserid/lib/webfinger.js
browserid/lib/wsapi.js 166 additions, 165 deletions

browserid/lib/wsapi.js
browserid/run.js 2 additions, 2 deletions

browserid/run.js

with 261 additions and 255 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