Merge branch 'master' of github.com:apollostack/apollo-server into ca… · apollographql/apollo-server@ed86c51 · GitHub

Commit

Merge branch 'master' of github.com:apollostack/apollo-server into ca…

Browse files

…melcase-hapi

# Conflicts:
#	CHANGELOG.md
#	README.md
#	src/integrations/hapiApollo.test.ts
#	src/integrations/hapiApollo.ts

Loading branch information

nnance committed Sep 9, 2016

2 parents c97579a + 40e8b55 commit ed86c51