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

This commit is contained in:
Roy Tam 2019-04-19 09:42:27 +08:00
commit 838b5e4e48
569 changed files with 1183 additions and 62621 deletions

View file

@ -1306,8 +1306,6 @@ static nsresult pref_InitInitialObjects()
"winpref.js"
#elif defined(XP_UNIX)
"unix.js"
#elif defined(XP_BEOS)
"beos.js"
#endif
};

View file

@ -5159,9 +5159,6 @@ pref("layout.accessiblecaret.hide_carets_for_mouse_input", true);
// Wakelock is disabled by default.
pref("dom.wakelock.enabled", false);
// The URL of the Firefox Accounts auth server backend
pref("identity.fxaccounts.auth.uri", "https://api.accounts.firefox.com/v1");
// disable mozsample size for now
pref("image.mozsamplesize.enabled", false);