diff options
| author | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-18 20:35:10 -0400 |
|---|---|---|
| committer | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-18 20:35:10 -0400 |
| commit | af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec (patch) | |
| tree | 4aac6c4383fb9e279fccb13c65a4e44595fd4cf6 /modules | |
| parent | 40fc72376411587e7bf9985fb9545eca1c9aaa8e (diff) | |
| parent | 51722cd4fecb5c8c79a302f2771cad71535df5ea (diff) | |
| download | UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar.gz UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar.lz UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar.xz UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.zip | |
Merge branch 'master' into default-pref
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/libpref/Preferences.cpp | 2 | ||||
| -rw-r--r-- | modules/libpref/init/all.js | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp index c56cad98d..19487704f 100644 --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp @@ -1306,8 +1306,6 @@ static nsresult pref_InitInitialObjects() "winpref.js" #elif defined(XP_UNIX) "unix.js" -#elif defined(XP_BEOS) - "beos.js" #endif }; diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index aed20c854..10f9b994a 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -5151,9 +5151,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); |