Skip to content

Commit

Permalink
Minor version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Rodrigo Machado committed Jun 22, 2018
1 parent 995cfec commit 84b4c1e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [1.5.2]
### Fixed
- Correctly merge directives when using `mergeTypes` in [PR #144](https://github.com/okgrow/merge-graphql-schemas/pull/144) by [@JulianKnodt](https://github.com/julianknodt)

## [1.5.1] - 2018-03-16
### Changed
- Updated the astPrinter with the latest print.js code from graphql-js. [PR #123](https://github.com/okgrow/merge-graphql-schemas/pull/123)
Expand All @@ -25,7 +29,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Fixed
- Correctly handle NonNullTypes when using `mergeTypes(types, { all: true})` Thanks to [PR #125](https://github.com/okgrow/merge-graphql-schemas/pull/125) by [@lastmjs](https://github.com/lastmjs)
- Correctly merge directives when using `mergeTypes` in [PR #144](https://github.com/okgrow/merge-graphql-schemas/pull/144) by [@JulianKnodt](https://github.com/julianknodt)

## [1.5.0] - 2018-02-26
### Added
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "merge-graphql-schemas",
"author": "OK GROW!",
"version": "1.5.1",
"version": "1.5.2",
"description": "A utility library to facilitate merging of modularized GraphQL schemas and resolver objects.",
"repository": {
"type": "git",
Expand Down

0 comments on commit 84b4c1e

Please sign in to comment.