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

@ -77,7 +77,7 @@
locale/browser/preferences/preferences.dtd (%chrome/browser/preferences/preferences.dtd)
locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties)
locale/browser/preferences/containers.properties (%chrome/browser/preferences/containers.properties)
* locale/browser/preferences/privacy.dtd (%chrome/browser/preferences/privacy.dtd)
locale/browser/preferences/privacy.dtd (%chrome/browser/preferences/privacy.dtd)
locale/browser/preferences/security.dtd (%chrome/browser/preferences/security.dtd)
locale/browser/preferences/containers.dtd (%chrome/browser/preferences/containers.dtd)
#ifdef MOZ_SERVICES_SYNC