Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d5a1e1d authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge branch '3697-master-207' into 'master'

Update chromium to v140.0.7339.207

See merge request !100
parents 6699a1ed ced2db57
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
From 64ec6e5e49c855114d9b33c966f187f90377ad8c Mon Sep 17 00:00:00 2001
From 3006c88ba4425c72fd3e55f91e04d48e285cccfc Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Fri, 30 Mar 2018 10:09:03 +0200
Subject: Multiple fingerprinting mitigations
@@ -703,7 +703,7 @@ index eb52f09e3404d..fc0cb2b8a52db 100644
 
   // Methods overridden by all sub-classes
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 842e4acc21d1f..3153e4797c167 100644
index 684a35b0e015f..d4abcbea91308 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3332,6 +3332,12 @@
+2 −2
Original line number Diff line number Diff line
From 7769a1d37bdbf7bcab71da571b80011c28e46e50 Mon Sep 17 00:00:00 2001
From 2d479f92e92c6a760902c2d24e4c2076ac2aea67 Mon Sep 17 00:00:00 2001
From: mars <gzhqyz@gmail.com>
Date: Sun, 2 Aug 2020 00:37:49 +0800
Subject: Update i18n zh_CN support
@@ -155,7 +155,7 @@ index a3cf49d2f42f4..fa5d8bb4dfcb7 100644
+<translation id="8431607486333903291">WebRTC</translation>
+</translationbundle>
diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb
index 26fe4833855d8..0cd9322afd5be 100644
index d3a113c7fecf1..c127953cb9f65 100644
--- a/components/strings/components_strings_zh-CN.xtb
+++ b/components/strings/components_strings_zh-CN.xtb
@@ -5012,4 +5012,33 @@
+1 −1
Original line number Diff line number Diff line
chromium_version="140.0.7339.155"
chromium_version="140.0.7339.207"
cromite_branch="v140.0.7339.186-fde090c0d3690592570011055c980f1679d2b28d"
ungoogled_chromium_branch="140.0.7339.185-1"