fixed merge conflicts
Showing
with
263 additions
and
181 deletions
This diff is collapsed.
Click to expand it.
... | @@ -24,6 +24,7 @@ | ... | @@ -24,6 +24,7 @@ |
"jsonwebtoken": "~0.4.0", | "jsonwebtoken": "~0.4.0", | ||
"lodash": "^3.10.1", | "lodash": "^3.10.1", | ||
"moment": "^2.18.1", | "moment": "^2.18.1", | ||
"password-generator": "^2.1.0", | |||
"rc": "~0.5.0", | "rc": "~0.5.0", | ||
"sails": "^0.12.3", | "sails": "^0.12.3", | ||
"sails-disk": "~0.10.0", | "sails-disk": "~0.10.0", | ||
... | ... |
Please
register
or
sign in
to comment