diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-19 10:24:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-19 10:24:29 +0200 |
| commit | c9a6c8f3626d0c7650d92aecf40891295072e3a0 (patch) | |
| tree | c84b33a58ed6637327e6b90953402805c3f9dbb1 /chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json | |
| parent | 960816553d69155b16592e45ba42bf88683dff64 (diff) | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
| download | qtwebengine-chromium-c9a6c8f3626d0c7650d92aecf40891295072e3a0.tar.gz | |
Merge remote-tracking branch 'origin/upstream-master' into 67-based
Change-Id: I864dabe43f1057024ef3560001c820d1734d96c0
Diffstat (limited to 'chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json')
| -rw-r--r-- | chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json b/chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json index 5a7f063708f..f305b16a88d 100644 --- a/chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json +++ b/chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json @@ -1,5 +1,5 @@ { - "x-version": 34, + "x-version": 36, "google-talk": { "mime_types": [ ], @@ -115,9 +115,9 @@ ], "versions": [ { - "version": "28.0.0.161", + "version": "29.0.0.171", "status": "requires_authorization", - "reference": "https://helpx.adobe.com/security/products/flash-player/apsb18-03.html" + "reference": "https://helpx.adobe.com/security/products/flash-player/apsb18-16.html" } ], "lang": "en-US", |