Merge branch 'master' into dont-lock-down-react-peer

apollographql · Apr 13, 2017 · 56c5006 · 56c5006
2 parents c658caa + 431a2fb
commit 56c5006
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,12 +4,10 @@
   "editor.rulers": [100],
   "files.trimTrailingWhitespace": true,
   "files.insertFinalNewline": true,
-  "editor.wrappingColumn": -1,
   "files.exclude": {
     "**/.git": true,
     "**/.DS_Store": true,
     "node_modules": false,
-    "scripts": true,
     "test-lib": true,
     "lib": false,
     ".gitignore": true,

diff --git a/Changelog.md b/Changelog.md
@@ -3,7 +3,8 @@
 Expect active development and potentially significant breaking changes in the `0.x` track. We'll try to be diligent about releasing a `1.0` version in a timely fashion (ideally within 1 or 2 months), so that we can take advantage of SemVer to signify breaking changes from that point on.
 
 ### vNext
-- Fix version lock down for peer dependency version of React
+- Fix version lock down for peer dependency version of React. [PR #626](https://github.com/apollographql/react-apollo/pull/626)
+- Switch `graphql-tag` dependency to `2.0.0`. This isn't really a breaking change because we only export `gql` from `react-apollo`.
 - Fix: convert deprecated `React.PropTypes` to `PropTypes` provided by the `prop-types` package. [PR #628](https://github.com/apollographql/react-apollo/pull/628)
 
 ### 1.0.2