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

74a0326e

Commit 74a0326e authored 13 years ago by Austin King

Downloads
- Plain Diff

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

Conflicts:
	resources/static/dialog/views/required_email.ejs
	resources/static/dialog/views/verify_primary_user.ejs
	scripts/deploy/vm.js

parents a6aca591 f90bf01a

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

resources/static/dialog/views/verify_primary_user.ejs
scripts/deploy.js 12 additions, 6 deletions

scripts/deploy.js
scripts/deploy/git.js 26 additions, 0 deletions

scripts/deploy/git.js
scripts/deploy/vm.js 2 additions, 2 deletions

scripts/deploy/vm.js

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