Merge branch 'dev' into feature_primaries (819ecc26) · 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

819ecc26

Commit 819ecc26 authored 13 years ago by Lloyd Hilaiel

Downloads
- Plain Diff

Merge branch 'dev' into feature_primaries

parents 816c1e0a 7d2d2f95

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

bin/load_gen 16 additions, 5 deletions

bin/load_gen
lib/bcrypt.js 4 additions, 2 deletions

lib/bcrypt.js
lib/configuration.js 6 additions, 3 deletions

lib/configuration.js
lib/load_gen/activities/add_email.js 1 addition, 0 deletions

lib/load_gen/activities/add_email.js
lib/load_gen/user_db.js 4 additions, 0 deletions

lib/load_gen/user_db.js
lib/wsapi/authenticate_user.js 5 additions, 0 deletions

lib/wsapi/authenticate_user.js
package.json 1 addition, 1 deletion

package.json

with 37 additions and 11 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