Merge branch 'dev' of github.com:mozilla/browserid into issue_1240_tos_update
Conflicts: resources/static/test/testHelpers/helpers.js
No related branches found
No related tags found
Showing
- lib/browserid/prove_template.ejs 1 addition, 1 deletionlib/browserid/prove_template.ejs
- package.json 1 addition, 1 deletionpackage.json
- resources/static/communication_iframe/start.js 5 additions, 0 deletionsresources/static/communication_iframe/start.js
- resources/static/css/style.css 0 additions, 20 deletionsresources/static/css/style.css
- resources/static/dialog/controllers/dialog.js 5 additions, 0 deletionsresources/static/dialog/controllers/dialog.js
- resources/static/dialog/views/error.ejs 4 additions, 0 deletionsresources/static/dialog/views/error.ejs
- resources/static/i/badge.png 0 additions, 0 deletionsresources/static/i/badge.png
- resources/static/i/button-arrow.png 0 additions, 0 deletionsresources/static/i/button-arrow.png
- resources/static/i/count.png 0 additions, 0 deletionsresources/static/i/count.png
- resources/static/i/firefox_logo.png 0 additions, 0 deletionsresources/static/i/firefox_logo.png
- resources/static/i/grain.png 0 additions, 0 deletionsresources/static/i/grain.png
- resources/static/i/marketplace-header.png 0 additions, 0 deletionsresources/static/i/marketplace-header.png
- resources/static/i/persona-logo-transparent.png 0 additions, 0 deletionsresources/static/i/persona-logo-transparent.png
- resources/static/i/persona-logo-wordmark.png 0 additions, 0 deletionsresources/static/i/persona-logo-wordmark.png
- resources/static/i/tutorial_1.png 0 additions, 0 deletionsresources/static/i/tutorial_1.png
- resources/static/i/tutorial_2.png 0 additions, 0 deletionsresources/static/i/tutorial_2.png
- resources/static/i/tutorial_3.png 0 additions, 0 deletionsresources/static/i/tutorial_3.png
- resources/static/pages/verify_secondary_address.js 38 additions, 50 deletionsresources/static/pages/verify_secondary_address.js
- resources/static/shared/error-messages.js 8 additions, 0 deletionsresources/static/shared/error-messages.js
- resources/static/shared/storage.js 32 additions, 26 deletionsresources/static/shared/storage.js
Loading
Please register or sign in to comment