Merge branch 'dev' into issue_1655_license
Conflicts: resources/views/layout.ejs
Showing
- bin/browserid 1 addition, 1 deletionbin/browserid
- bin/static 1 addition, 1 deletionbin/static
- bin/verifier 2 additions, 0 deletionsbin/verifier
- config/aws.json 2 additions, 2 deletionsconfig/aws.json
- config/production.json 0 additions, 1 deletionconfig/production.json
- docs/TESTING.md 13 additions, 0 deletionsdocs/TESTING.md
- lib/configuration.js 21 additions, 2 deletionslib/configuration.js
- lib/i18n.js 22 additions, 23 deletionslib/i18n.js
- lib/primary.js 21 additions, 6 deletionslib/primary.js
- lib/static/views.js 35 additions, 15 deletionslib/static/views.js
- lib/static_resources.js 2 additions, 1 deletionlib/static_resources.js
- lib/validate.js 18 additions, 3 deletionslib/validate.js
- lib/wsapi.js 1 addition, 1 deletionlib/wsapi.js
- lib/wsapi/address_info.js 2 additions, 2 deletionslib/wsapi/address_info.js
- package.json 2 additions, 1 deletionpackage.json
- resources/static/common/js/browserid.js 5 additions, 1 deletionresources/static/common/js/browserid.js
- resources/static/common/js/gettext.js 11 additions, 3 deletionsresources/static/common/js/gettext.js
- resources/static/common/js/lib/ejs.js 10 additions, 1 deletionresources/static/common/js/lib/ejs.js
- resources/static/common/js/lib/gobbledygook.js 1 addition, 0 deletionsresources/static/common/js/lib/gobbledygook.js
- resources/static/common/js/modules/interaction_data.js 6 additions, 2 deletionsresources/static/common/js/modules/interaction_data.js
Loading
Please register or sign in to comment