merged conflict
No related branches found
No related tags found
Showing
- bin/browserid 1 addition, 1 deletionbin/browserid
- bin/proxy 4 additions, 1 deletionbin/proxy
- lib/configuration.js 5 additions, 1 deletionlib/configuration.js
- lib/db.js 9 additions, 8 deletionslib/db.js
- lib/db/json.js 32 additions, 8 deletionslib/db/json.js
- lib/db/mysql.js 44 additions, 39 deletionslib/db/mysql.js
- lib/http_forward.js 19 additions, 1 deletionlib/http_forward.js
- lib/httputils.js 4 additions, 0 deletionslib/httputils.js
- lib/primary.js 14 additions, 2 deletionslib/primary.js
- lib/static_resources.js 2 additions, 3 deletionslib/static_resources.js
- lib/verifier/certassertion.js 20 additions, 10 deletionslib/verifier/certassertion.js
- lib/wsapi.js 1 addition, 1 deletionlib/wsapi.js
- lib/wsapi/address_info.js 7 additions, 7 deletionslib/wsapi/address_info.js
- lib/wsapi/cert_key.js 1 addition, 1 deletionlib/wsapi/cert_key.js
- lib/wsapi/complete_email_addition.js 32 additions, 51 deletionslib/wsapi/complete_email_addition.js
- lib/wsapi/complete_user_creation.js 49 additions, 26 deletionslib/wsapi/complete_user_creation.js
- lib/wsapi/email_for_token.js 16 additions, 3 deletionslib/wsapi/email_for_token.js
- lib/wsapi/have_email.js 3 additions, 3 deletionslib/wsapi/have_email.js
- lib/wsapi/list_emails.js 3 additions, 3 deletionslib/wsapi/list_emails.js
- lib/wsapi/stage_email.js 55 additions, 16 deletionslib/wsapi/stage_email.js
Loading
Please register or sign in to comment