Merge branch 'dev' of github.com:mozilla/browserid into amazon_deploy (265b221d) · 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

265b221d

Commit 265b221d authored 13 years ago by Lloyd Hilaiel

Downloads
- Plain Diff

Merge branch 'dev' of github.com:mozilla/browserid into amazon_deploy

parents 3838d407 e15bde5b

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

docs/PRIMARY_PROTOCOL.md 1 addition, 1 deletion

docs/PRIMARY_PROTOCOL.md
lib/browserid/prove_template.ejs 2 additions, 2 deletions

lib/browserid/prove_template.ejs
resources/static/dialog/views/add_email.ejs 1 addition, 1 deletion

resources/static/dialog/views/add_email.ejs
resources/static/dialog/views/authenticate.ejs 1 addition, 1 deletion

resources/static/dialog/views/authenticate.ejs
resources/static/dialog/views/verify_primary_user.ejs 1 addition, 1 deletion

resources/static/dialog/views/verify_primary_user.ejs
resources/static/provisioning_api.js 0 additions, 2 deletions

resources/static/provisioning_api.js
scripts/compress.sh 4 additions, 1 deletion

scripts/compress.sh

with 10 additions and 9 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