diff options
| author | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-29 09:16:00 +0200 |
|---|---|---|
| committer | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-29 09:16:00 +0200 |
| commit | dd061b09ae345a272810984335cc84281b0c87ce (patch) | |
| tree | b7c6d40673d3452a4a1456ba9370eca1cec986f1 /package.json | |
| parent | Wrong location for img (diff) | |
| parent | cleaning (diff) | |
| download | Divid-dd061b09ae345a272810984335cc84281b0c87ce.tar.gz | |
Merge branch 'dev'
Conflicts:
app.js
router.js
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/package.json b/package.json index 48ae466..c2ca75b 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,9 @@ , "passport-local": "latest" , "passport-facebook": "latest" , "passport-twitter": "latest" - , "bcrypt": "latest" , "nodemon": "latest" } - , "decDependencies": { + , "devDependencies": { "mocha": "latest" } } |