Merge branch 'master' into db (46a16da5) · 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

46a16da5

Commit 46a16da5 authored 13 years ago by Lloyd Hilaiel

Downloads
- Plain Diff

Merge branch 'master' into db

Conflicts:
	browserid/lib/wsapi.js

parents bbcd9a2d f131d0c7

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
README.md 6 additions, 15 deletions

README.md
browserid/lib/wsapi.js 18 additions, 17 deletions

browserid/lib/wsapi.js
package.json 19 additions, 0 deletions

package.json
primary/lib/wsapi.js 10 additions, 10 deletions

primary/lib/wsapi.js
verifier/app.js 4 additions, 4 deletions

verifier/app.js

with 58 additions and 46 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