diff options
| author | Andrej Mihajlov <and@codeispoetry.ru> | 2017-07-03 13:54:59 +0300 |
|---|---|---|
| committer | Andrej Mihajlov <and@codeispoetry.ru> | 2017-07-03 13:54:59 +0300 |
| commit | 6b8f00eb25e85eb466fd60e28df43e591f372507 (patch) | |
| tree | 162d9b7963aa1a50d544e1429f7fc094b2f445dc | |
| parent | e7fd60d8bffc33cf6e1a6a33c9fffc28dc112142 (diff) | |
| parent | 5e916d9572cc3a61b32ccda769ad6fd49840e4f1 (diff) | |
| download | mullvadvpn-6b8f00eb25e85eb466fd60e28df43e591f372507.tar.xz mullvadvpn-6b8f00eb25e85eb466fd60e28df43e591f372507.zip | |
Merge branch 'hotfix/update-react-if'
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json index c4888aa2ad..08c05e0cf2 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "react": "^15.6.1", "react-custom-scrollbars": "^4.0.2", "react-dom": "^15.6.1", - "react-if": "^2.1.0", + "react-if": "^2.2.1", "react-mapbox-gl": "^1.3.0", "react-redux": "^5.0.2", "react-router": "^4.1.1", @@ -2986,11 +2986,11 @@ ice-cap@0.0.4: cheerio "0.20.0" color-logger "0.0.3" -iconv-lite@0.4.13, iconv-lite@~0.4.13: +iconv-lite@0.4.13: version "0.4.13" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" -iconv-lite@^0.4.17: +iconv-lite@^0.4.17, iconv-lite@~0.4.13: version "0.4.18" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2" @@ -4438,9 +4438,9 @@ react-dom@^15.6.1: object-assign "^4.1.0" prop-types "^15.5.10" -react-if@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/react-if/-/react-if-2.1.0.tgz#f9ff6286e9561de17c481e81fb2b56b431a60a00" +react-if@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/react-if/-/react-if-2.2.1.tgz#b6a2a3a15d6f80fa4db43ed6d18ece6e9d12a11c" react-mapbox-gl@^1.3.0: version "1.12.0" |