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

b5bb779c

Commit b5bb779c authored 13 years ago by Lloyd Hilaiel

Downloads
- Plain Diff

Merge branch 'dev' into db

Conflicts:
	browserid/app.js

parents ba0892d8 d7ff6781

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 2 additions, 0 deletions

ChangeLog
DEPLOYMENT.md 278 additions, 0 deletions

DEPLOYMENT.md
README.md 25 additions, 11 deletions

README.md
browserid/app.js 14 additions, 5 deletions

browserid/app.js
browserid/compress.sh 1 addition, 1 deletion

browserid/compress.sh
browserid/run.js 1 addition, 0 deletions

browserid/run.js
browserid/static/dialog/controllers/dialog_controller.js 14 additions, 0 deletions

browserid/static/dialog/controllers/dialog_controller.js
browserid/tests/forgotten-email-test.js 7 additions, 4 deletions

browserid/tests/forgotten-email-test.js
libs/environment.js 85 additions, 0 deletions

libs/environment.js
libs/substitute.js 71 additions, 0 deletions

libs/substitute.js
run.js 76 additions, 140 deletions

run.js

with 574 additions and 161 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