Skip to content

Commit 3e61f26

Browse files
authored
Merge pull request #60 from KunalKapadia/master
Master to Develop
2 parents 99edd63 + c554352 commit 3e61f26

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ pids
1111
# IDE
1212
.idea
1313

14+
# OS generated files
15+
.DS_Store
16+
.DS_Store?
17+
._*
18+
.Spotlight-V100
19+
ehthumbs.db
20+
Icon?
21+
Thumbs.db
22+
1423
# Babel ES6 compiles files
1524
dist
1625

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
"express-jwt": "3.4.0",
4646
"express-validation": "1.0.1",
4747
"express-winston": "2.0.0",
48-
"helmet": "2.2.0",
48+
"helmet": "2.3.0",
4949
"http-status": "^0.2.0",
5050
"joi": "9.1.0",
5151
"jsonwebtoken": "7.1.9",
5252
"method-override": "^2.3.5",
53-
"mongoose": "4.6.1",
53+
"mongoose": "4.6.2",
5454
"morgan": "1.7.0",
5555
"winston": "2.2.0"
5656
},

0 commit comments

Comments
 (0)