Merge branch 'master' into talk-plugin-avatar

This commit is contained in:
Kim Gardner
2017-07-11 13:46:41 -04:00
committed by GitHub
11 changed files with 260 additions and 5 deletions
+1
View File
@@ -79,6 +79,7 @@
"express-session": "^1.15.1",
"file-loader": "^0.11.2",
"form-data": "^2.1.2",
"fs-extra": "^3.0.1",
"gql-merge": "^0.0.4",
"graphql": "^0.9.1",
"graphql-errors": "^2.1.0",