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

efba68c3

Commit efba68c3 authored 13 years ago by Austin King

Downloads
- Plain Diff

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

Conflicts:
	lib/configuration.js

parents 221dc448 e842c63a

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

lib/browserid/views.js 16 additions, 1 deletion

lib/browserid/views.js
lib/configuration.js 8 additions, 2 deletions

lib/configuration.js
lib/secrets.js 1 addition, 1 deletion

lib/secrets.js
lib/version.js 54 additions, 0 deletions

lib/version.js
lib/wsapi/session_context.js 8 additions, 3 deletions

lib/wsapi/session_context.js
resources/static/dialog/controllers/code_check.js 1 addition, 1 deletion

resources/static/dialog/controllers/code_check.js
resources/static/include.js 1 addition, 1 deletion

resources/static/include.js
tests/software-version-test.js 32 additions, 0 deletions

tests/software-version-test.js

with 121 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