Merge remote-tracking branch 'origin/dev' into design
Conflicts: browserid/static/include.js
Showing
- browserid/static/dialog/resources/channel.js 23 additions, 7 deletionsbrowserid/static/dialog/resources/channel.js
- browserid/static/include.js 16 additions, 4 deletionsbrowserid/static/include.js
- browserid/static/relay/relay.js 8 additions, 0 deletionsbrowserid/static/relay/relay.js
- browserid/views/relay.ejs 1 addition, 34 deletionsbrowserid/views/relay.ejs
Loading
Please register or sign in to comment