Merge remote-tracking branch 'origin/dev' into design (0885c80a) · Commits · Hexang 息壤平台 / persona · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

persona
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

0885c80a

Commit 0885c80a authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/dev' into design

Conflicts:
	browserid/static/include.js

parents c62c3b3d 3221d128

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

browserid/static/dialog/resources/channel.js 23 additions, 7 deletions

browserid/static/dialog/resources/channel.js
browserid/static/include.js 16 additions, 4 deletions

browserid/static/include.js
browserid/static/relay/relay.js 8 additions, 0 deletions

browserid/static/relay/relay.js
browserid/views/relay.ejs 1 addition, 34 deletions

browserid/views/relay.ejs

with 48 additions and 45 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment