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

This commit is contained in:
Roy Tam 2019-08-17 13:34:39 +08:00
commit 18869d3807
54 changed files with 362 additions and 1459 deletions

View file

@ -1006,12 +1006,7 @@ pref("services.sync.syncedTabs.showRemoteIcons", true);
pref("services.sync.sendTabToDevice.enabled", true);
// Developer edition preferences
#ifdef MOZ_DEV_EDITION
sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
#else
sticky_pref("lightweightThemes.selectedThemeID", "");
#endif
// Whether the character encoding menu is under the main Firefox button. This
// preference is a string so that localizers can alter it.