Merge branch 'dev' into design (45668463) · 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

45668463

Commit 45668463 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'dev' into design

Conflicts:
	browserid/static/include.js

parents d79094e0 50404cce

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 3 additions, 0 deletions

ChangeLog
browserid/app.js 4 additions, 1 deletion

browserid/app.js
browserid/static/dialog/resources/channel.js 22 additions, 43 deletions

browserid/static/dialog/resources/channel.js
browserid/static/include.js 35 additions, 19 deletions

browserid/static/include.js
package.json 1 addition, 1 deletion

package.json
verifier/app.js 1 addition, 1 deletion

verifier/app.js

with 66 additions and 65 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