Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
damour authored Feb 19, 2018
2 parents 22ef1e6 + 5b90120 commit a2b9e90
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"graphql": "0.11.7",
"husky": "0.14.3",
"istanbul": "1.1.0-alpha.1",
"lerna": "2.8.0",
"lint-staged": "6.1.0",
"lerna": "2.9.0",
"lint-staged": "6.1.1",
"mocha": "4.1.0",
"npm-check-updates": "2.14.0",
"prettier": "1.10.2",
Expand All @@ -54,6 +54,6 @@
"sinon": "4.3.0",
"supertest": "3.0.0",
"supertest-as-promised": "4.0.2",
"typescript": "2.7.1"
"typescript": "2.7.2"
}
}
2 changes: 1 addition & 1 deletion packages/apollo-server-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@types/graphql": "0.11.7",
"fibers": "1.0.15",
"meteor-promise": "0.8.6",
"typescript": "2.7.1"
"typescript": "2.7.2"
},
"peerDependencies": {
"graphql": "^0.9.0 || ^0.10.0 || ^0.11.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@types/multer": "1.3.6",
"apollo-server-integration-testsuite": "^1.3.1",
"body-parser": "1.18.2",
"connect": "3.6.5",
"connect": "3.6.6",
"connect-query": "1.0.0",
"express": "4.16.2",
"multer": "1.3.0"
Expand Down

0 comments on commit a2b9e90

Please sign in to comment.