Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2023-10-06 10:48:24 +08:00
commit 879ab0d7dc
72 changed files with 81921 additions and 71421 deletions

View file

@ -8,7 +8,7 @@ browser.jar:
content/browser/preferences/in-content/subdialogs.js
content/browser/preferences/in-content/main.js
* content/browser/preferences/in-content/privacy.js
content/browser/preferences/in-content/privacy.js
content/browser/preferences/in-content/containers.js
content/browser/preferences/in-content/advanced.js
content/browser/preferences/in-content/applications.js
@ -16,5 +16,5 @@ browser.jar:
#ifdef MOZ_SERVICES_SYNC
content/browser/preferences/in-content/sync.js
#endif
* content/browser/preferences/in-content/security.js
content/browser/preferences/in-content/security.js
content/browser/preferences/in-content/search.js