diff options
author | David Yip <yipdw@member.fsf.org> | 2018-04-18 18:48:12 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-04-18 18:48:12 -0500 |
commit | 16d5217502a09132dc14a3a808036af5dbcb73dd (patch) | |
tree | deb7b81919e5f8082b7d848b0b8df4787d37f001 /yarn.lock | |
parent | 813da6788e5129579db04e89aac3076902af2c7a (diff) | |
parent | ff87d1bc3ecdb81ff5c523f0964ecf223a503d30 (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json
Diffstat (limited to 'yarn.lock')
-rw-r--r-- | yarn.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/yarn.lock b/yarn.lock index 03915eafe..ea54790c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5998,9 +5998,9 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-dom@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" +react-dom@^16.3.0: + version "16.3.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df" dependencies: fbjs "^0.8.16" loose-envify "^1.1.0" @@ -6184,9 +6184,9 @@ react-transition-group@^2.2.0: prop-types "^15.5.8" warning "^3.0.0" -react@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" +react@^16.3.0: + version "16.3.2" + resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9" dependencies: fbjs "^0.8.16" loose-envify "^1.1.0" |