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

Commit 92417e67 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '3747-master-upstream' into 'master'

Update chromium to 141.0.7390.122

See merge request !110
parents 63fd3cb0 8c369f32
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
From 984f07b68e6ef8f8f73906544c11da858818e240 Mon Sep 17 00:00:00 2001
From 5594cea70ee9e1881a800ac65b3970ddb850e54b Mon Sep 17 00:00:00 2001
From: mars <gzhqyz@gmail.com>
From: mars <gzhqyz@gmail.com>
Date: Sun, 2 Aug 2020 00:37:49 +0800
Date: Sun, 2 Aug 2020 00:37:49 +0800
Subject: Update i18n zh_CN support
Subject: Update i18n zh_CN support
@@ -15,7 +15,7 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com>
 6 files changed, 133 insertions(+), 6 deletions(-)
 6 files changed, 133 insertions(+), 6 deletions(-)


diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb
diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb
index 81eca8cf6b0a0..70eb4deae81f1 100644
index 32ac1038988e5..562cb7a2f729f 100644
--- a/chrome/app/resources/generated_resources_zh-CN.xtb
--- a/chrome/app/resources/generated_resources_zh-CN.xtb
+++ b/chrome/app/resources/generated_resources_zh-CN.xtb
+++ b/chrome/app/resources/generated_resources_zh-CN.xtb
@@ -11943,4 +11943,6 @@
@@ -11943,4 +11943,6 @@
+1 −1
Original line number Original line Diff line number Diff line
chromium_version="141.0.7390.111"
chromium_version="141.0.7390.122"
cromite_branch="v141.0.7390.111-33b5ec3a1777cbed9f83f62204fc09c258e1f0ef"
cromite_branch="v141.0.7390.111-33b5ec3a1777cbed9f83f62204fc09c258e1f0ef"
ungoogled_chromium_branch="141.0.7390.107-1"
ungoogled_chromium_branch="141.0.7390.107-1"