diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-02-21 16:53:25 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-02-21 16:53:25 +0100 |
| commit | 9d9b440719f546e2eae52ec1424780c0cf5babc0 (patch) | |
| tree | 96c881d4c912495cbc4e06aae6fdcb5b9ed252fe | |
| parent | 722d5770606046137e2db42bdcf22928cf7d374e (diff) | |
| parent | 8b6c848ef6239a563eebb00015aafe10bf11e9d0 (diff) | |
| download | mullvadvpn-9d9b440719f546e2eae52ec1424780c0cf5babc0.tar.xz mullvadvpn-9d9b440719f546e2eae52ec1424780c0cf5babc0.zip | |
Merge branch 'fix-react-router-redux-version'
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/package.json b/package.json index 39db9c4764..56894294b4 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "react-native-windows": "^0.52.0-rc.0", "react-redux": "^5.0.2", "react-router": "^4.2.0", - "react-router-redux": "5.0.0-alpha.6", + "react-router-redux": "^5.0.0-alpha.9", "react-simple-maps": "^0.10.1", "react-transition-group": "^1.2.0", "reactxp": "^0.51.8", @@ -3985,7 +3985,7 @@ he@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" -history@^4.5.1, history@^4.6.1, history@^4.7.2: +history@^4.6.1, history@^4.7.2: version "4.7.2" resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b" dependencies: @@ -6235,15 +6235,15 @@ react-redux@^5.0.2: loose-envify "^1.1.0" prop-types "^15.5.10" -react-router-redux@5.0.0-alpha.6: - version "5.0.0-alpha.6" - resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-5.0.0-alpha.6.tgz#7418663c2ecd3c51be856fcf28f3d1deecc1a576" +react-router-redux@^5.0.0-alpha.9: + version "5.0.0-alpha.9" + resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-5.0.0-alpha.9.tgz#825431516e0e6f1fd93b8807f6bd595e23ec3d10" dependencies: - history "^4.5.1" - prop-types "^15.5.4" - react-router "^4.1.1" + history "^4.7.2" + prop-types "^15.6.0" + react-router "^4.2.0" -react-router@^4.1.1, react-router@^4.2.0: +react-router@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986" dependencies: |