Merge branch 'master' into csp

This commit is contained in:
Wyatt Johnson
2018-05-23 11:53:24 -06:00
committed by GitHub
6 changed files with 115 additions and 111 deletions
+1 -1
View File
@@ -58,7 +58,6 @@
"dependencies": {
"@coralproject/gql-merge": "^0.1.0",
"@coralproject/graphql-anywhere-optimized": "^0.1.0",
"accepts": "^1.3.4",
"apollo-client": "^1.9.1",
"apollo-engine": "^0.8.1",
"apollo-server-express": "^1.2.0",
@@ -109,6 +108,7 @@
"express-static-gzip": "^0.3.1",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^0.11.2",
"fluent-langneg": "^0.1.0",
"form-data": "^2.3.1",
"fs-extra": "^4.0.1",
"graphql": "^0.10.1",