diff options
| author | HumairAK <humair88@hotmail.com> | 2016-07-25 03:29:23 +0000 |
|---|---|---|
| committer | HumairAK <humair88@hotmail.com> | 2016-07-25 03:29:23 +0000 |
| commit | 7c222d2418ba44bd4f2f9ffd844f97f43974029a (patch) | |
| tree | a8282098bea1a18312fda510d8f635f3dd97eee1 /package.json | |
| parent | fc3cc6aee7ce7a28539d332902c0f9923d298c71 (diff) | |
| parent | 3ca0e78b313a1bded021cbb8b2dad241d7cad049 (diff) | |
fixed conflict
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/package.json b/package.json index 8380a3f..9e23edc 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,11 @@ "debug": "^2.2.0", "express": "^4.14.0", "express-handlebars": "^3.0.0", + "express-messages": "^1.0.1", "express-session": "^1.14.0", "express-validator": "^2.20.8", + "jquery": "^3.1.0", + "jsdom": "^3.1.2", "mongo-factory": "^1.0.0", "mongodb": "^2.2.2", "object-assign": "^4.1.0", @@ -37,5 +40,8 @@ "passport-local": "^1.0.0", "sanitizer": "^0.1.3", "socket.io": "^1.4.8" + }, + "devDependencies": { + "underscore": "~1.8.3" } } |