diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 13:24:59 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 13:24:59 +0100 |
commit | cd7832ee326b0c424d4ad1538efd074c86a68f9b (patch) | |
tree | 158872ea92d5df96b1290b578cbe574aaa2acfd5 /chromium/chrome/browser/resources/plugin_metadata/plugins_win.json | |
parent | 93cdb9906305e23304d9ff55350b7557fc1850cb (diff) | |
parent | 69b8f9169ffd66fdeca1ac60a4bc06b91d106186 (diff) | |
download | qtwebengine-chromium-cd7832ee326b0c424d4ad1538efd074c86a68f9b.tar.gz |
Merge remote-tracking branch 'origin/upstream-master' into 63-based
Change-Id: I4d88054034fccbb7409fa65c37d4498b74ec0578
Diffstat (limited to 'chromium/chrome/browser/resources/plugin_metadata/plugins_win.json')
-rw-r--r-- | chromium/chrome/browser/resources/plugin_metadata/plugins_win.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/chrome/browser/resources/plugin_metadata/plugins_win.json b/chromium/chrome/browser/resources/plugin_metadata/plugins_win.json index 00786d2f197..c5b325b08c2 100644 --- a/chromium/chrome/browser/resources/plugin_metadata/plugins_win.json +++ b/chromium/chrome/browser/resources/plugin_metadata/plugins_win.json @@ -1,5 +1,5 @@ { - "x-version": 39, + "x-version": 41, "google-talk": { "mime_types": [ ], @@ -137,9 +137,9 @@ ], "versions": [ { - "version": "26.0.0.126", + "version": "27.0.0.187", "status": "requires_authorization", - "reference": "https://helpx.adobe.com/security/products/flash-player/apsb17-17.html" + "reference": "https://helpx.adobe.com/security/products/flash-player/apsb17-33.html" } ], "lang": "en-US", |