Merge branch 'dev' of github.com:mozilla/browserid into issue1917
Conflicts: lib/i18n.js package.json
Showing
- .awsbox.json 2 additions, 1 deletion.awsbox.json
- .gitignore 1 addition, 0 deletions.gitignore
- bin/browserid 11 additions, 42 deletionsbin/browserid
- bin/dbwriter 5 additions, 5 deletionsbin/dbwriter
- bin/keysigner 1 addition, 1 deletionbin/keysigner
- bin/router 33 additions, 10 deletionsbin/router
- bin/static 106 additions, 0 deletionsbin/static
- bin/verifier 3 additions, 3 deletionsbin/verifier
- config/aws.json 1 addition, 2 deletionsconfig/aws.json
- config/local.json 1 addition, 0 deletionsconfig/local.json
- config/production.json 2 additions, 0 deletionsconfig/production.json
- docs/TESTING.md 51 additions, 5 deletionsdocs/TESTING.md
- lib/configuration.js 4 additions, 0 deletionslib/configuration.js
- lib/email.js 1 addition, 1 deletionlib/email.js
- lib/i18n.js 7 additions, 5 deletionslib/i18n.js
- lib/static/email_templates/add.ejs 0 additions, 0 deletionslib/static/email_templates/add.ejs
- lib/static/email_templates/new.ejs 0 additions, 0 deletionslib/static/email_templates/new.ejs
- lib/static/email_templates/reset.ejs 1 addition, 1 deletionlib/static/email_templates/reset.ejs
- lib/static/views.js 2 additions, 0 deletionslib/static/views.js
- lib/static_resources.js 2 additions, 2 deletionslib/static_resources.js
Loading
Please register or sign in to comment