Merge branch 'dev' into feature-certs
Showing
- ChangeLog 17 additions, 0 deletionsChangeLog
- browserid/static/dialog/controllers/authenticate_controller.js 5 additions, 5 deletions...erid/static/dialog/controllers/authenticate_controller.js
- browserid/static/dialog/views/addemail.ejs 1 addition, 1 deletionbrowserid/static/dialog/views/addemail.ejs
- browserid/static/dialog/views/authenticate.ejs 1 addition, 1 deletionbrowserid/static/dialog/views/authenticate.ejs
- browserid/static/dialog/views/create.ejs 1 addition, 1 deletionbrowserid/static/dialog/views/create.ejs
- browserid/static/dialog/views/forgotpassword.ejs 1 addition, 1 deletionbrowserid/static/dialog/views/forgotpassword.ejs
- package.json 8 additions, 1 deletionpackage.json
- scripts/merge_train.sh 10 additions, 3 deletionsscripts/merge_train.sh
- verifier/lib/idassertion.js 11 additions, 0 deletionsverifier/lib/idassertion.js
Loading
Please register or sign in to comment