merged dev and resolved conflict
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- ChangeLog 13 additions, 0 deletionsChangeLog
- README.md 6 additions, 4 deletionsREADME.md
- bin/browserid 371 additions, 0 deletionsbin/browserid
- bin/keysigner 96 additions, 0 deletionsbin/keysigner
- bin/load_gen 7 additions, 8 deletionsbin/load_gen
- bin/verifier 46 additions, 48 deletionsbin/verifier
- browserid/static/dialog/views/authenticate.ejs 0 additions, 54 deletionsbrowserid/static/dialog/views/authenticate.ejs
- browserid/static/ping.txt 0 additions, 0 deletionsbrowserid/static/ping.txt
- browserid/views/index.ejs 0 additions, 40 deletionsbrowserid/views/index.ejs
- docs/DEPLOYMENT.md 7 additions, 7 deletionsdocs/DEPLOYMENT.md
- docs/LOAD_GENERATION.md 0 additions, 0 deletionsdocs/LOAD_GENERATION.md
- docs/ORGANIZATION.md 0 additions, 0 deletionsdocs/ORGANIZATION.md
- example/index.html 0 additions, 0 deletionsexample/index.html
- example/jquery-min.js 0 additions, 0 deletionsexample/jquery-min.js
- lib/browserid/ca.js 5 additions, 6 deletionslib/browserid/ca.js
- lib/browserid/email.js 3 additions, 3 deletionslib/browserid/email.js
- lib/browserid/fake_verification.js 0 additions, 0 deletionslib/browserid/fake_verification.js
- lib/browserid/http_forward.js 49 additions, 0 deletionslib/browserid/http_forward.js
- lib/browserid/prove_template.txt 0 additions, 0 deletionslib/browserid/prove_template.txt
Loading
Please register or sign in to comment