diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
commit | 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch) | |
tree | a4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /mobile/ios/installer/allowed-dupes.mn | |
parent | Adding debian version 124.0.1-1. (diff) | |
download | firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mobile/ios/installer/allowed-dupes.mn')
-rw-r--r-- | mobile/ios/installer/allowed-dupes.mn | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/mobile/ios/installer/allowed-dupes.mn b/mobile/ios/installer/allowed-dupes.mn new file mode 100644 index 0000000000..078bbe4e09 --- /dev/null +++ b/mobile/ios/installer/allowed-dupes.mn @@ -0,0 +1,26 @@ +# Known duplicate files +# This file is ideally removed, but some existing files will be allowed exceptions +# See bug 1303184 +# +# PLEASE DO NOT ADD MORE EXCEPTIONS TO THIS LIST +# + +# Row and column icons are duplicated +res/table-remove-column-active.gif +res/table-remove-row-active.gif +res/table-remove-column-hover.gif +res/table-remove-row-hover.gif +res/table-remove-column.gif +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 |