diff options
| author | Andrej Mihajlov <and@codeispoetry.ru> | 2017-05-29 09:44:06 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@codeispoetry.ru> | 2017-05-29 09:44:06 +0100 |
| commit | 1a71e922dddc67a25d41dddcaf4e57844df73488 (patch) | |
| tree | 010e48f769c5f687daca1499026745eaa7e961ea /package.json | |
| parent | f0eeffed6cfd055cf1aa1d23d240a0a8ded42466 (diff) | |
| parent | 0cd424fb094f82029f2a2e34bfd16ee8e5e87b10 (diff) | |
| download | mullvadvpn-1a71e922dddc67a25d41dddcaf4e57844df73488.tar.xz mullvadvpn-1a71e922dddc67a25d41dddcaf4e57844df73488.zip | |
Merge branch 'feature/react-router-v4'
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json index 8ad7abf859..8f41608b96 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "babel-runtime": "^6.22.0", "cheap-ruler": "^2.4.1", "electron-log": "^2.2.0", + "history": "^4.6.1", "jsonrpc-lite": "^1.2.3", "moment": "^2.17.1", "react": "^15.4.2", @@ -21,8 +22,8 @@ "react-if": "^2.1.0", "react-mapbox-gl": "^1.3.0", "react-redux": "^5.0.2", - "react-router": "^3.0.2", - "react-router-redux": "^4.0.7", + "react-router": "^4.1.1", + "react-router-redux": "5.0.0-alpha.6", "redux": "^3.0.0", "redux-actions": "^2.0.1", "redux-localstorage": "^0.4.1", |