diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /mobile/ios | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mobile/ios')
| -rw-r--r-- | mobile/ios/installer/allowed-dupes.mn | 6 | ||||
| -rw-r--r-- | mobile/ios/moz.build | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/mobile/ios/installer/allowed-dupes.mn b/mobile/ios/installer/allowed-dupes.mn index 078bbe4e09..ea78f4e303 100644 --- a/mobile/ios/installer/allowed-dupes.mn +++ b/mobile/ios/installer/allowed-dupes.mn @@ -16,11 +16,5 @@ res/table-remove-row.gif res/multilocale.txt update.locale -# Bug 1833829 - Rolling out new search configuration. -defaults/settings/main/search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11 -defaults/settings/main/search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136 -defaults/settings/main/search-config-icons/6a83583a-f0ba-fd39-2fdb-fd2b6990ea3b -defaults/settings/main/search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636 - components/httpd.sys.mjs chrome/remote/content/server/httpd.sys.mjs diff --git a/mobile/ios/moz.build b/mobile/ios/moz.build index 2253746e12..88a2ef2a6d 100644 --- a/mobile/ios/moz.build +++ b/mobile/ios/moz.build @@ -8,3 +8,4 @@ CONFIGURE_SUBST_FILES += ["installer/Makefile"] with Files("**"): BUG_COMPONENT = ("Core", "General") + SCHEDULES.exclusive = ["ios"] |