Skip to content

Commit

Permalink
Merge pull request #34 from conveyal/dev
Browse files Browse the repository at this point in the history
Merge in peer dependency change to create new release.
  • Loading branch information
trevorgerhardt authored Jan 31, 2017
2 parents 52e5eac + 52338f4 commit d1775f3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
"lodash.isequal": "^4.5.0",
"lodash.isobject": "^3.0.2",
"lodash.merge": "^4.6.0",
"react": "^15.4.2",
"react-addons-perf": "^15.4.2",
"react-dom": "^15.4.2",
"react-redux": "^5.0.2",
"react-router": "^3.0.2",
"react-router-redux": "^4.0.7",
Expand All @@ -37,12 +35,18 @@
"enzyme-to-json": "^1.4.5",
"mastarm": "^3.3.0",
"nock": "^9.0.2",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
"react-dom": "^15.4.2",
"react-test-renderer": "^15.4.2",
"redux-mock-store": "^1.2.2",
"semantic-release": "^6.3.2"
},
"standard": {
"parser": "babel-eslint"
},
"peerDependencies": {
"react": ">=15.0.0",
"react-dom": ">=15.0.0"
}
}
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4017,14 +4017,14 @@ lodash@^3.6.0:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
version "4.17.0"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.0.tgz#93f4466e5ab73e5a1f1216c34eea11535f0a8df5"

lodash@^4.17.2:
lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.3.0:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

lodash@^4.13.1, lodash@^4.2.0, lodash@^4.2.1:
version "4.17.0"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.0.tgz#93f4466e5ab73e5a1f1216c34eea11535f0a8df5"

lodash@~1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.3.1.tgz#a4663b53686b895ff074e2ba504dfb76a8e2b770"
Expand Down

0 comments on commit d1775f3

Please sign in to comment.