Skip to content

Commit

Permalink
Merge branch 'develop' into plugin-system
Browse files Browse the repository at this point in the history
* develop:
  Fix inline functions for custom scalars (#174)
  Fix types in Ghost example
  Fix nexus-prisma doc title and label (#166)
  [RFR] Allow schema construction even with unknown types (#155)
  Add docs for nexus-prisma v2 (#164)
  Fix wrong fieldName type on subscriptionField (and fix backingTypes.spec.ts) (#159)
  • Loading branch information
tgriesser committed Jul 13, 2019
2 parents ce6f836 + 5c8eb7a commit a803f5a
Show file tree
Hide file tree
Showing 15 changed files with 1,277 additions and 129 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ dist/*
website/build
examples/*/dist
website/static/playground-dist
yarn-error.log
yarn-error.log
coverage

0 comments on commit a803f5a

Please sign in to comment.