summaryrefslogtreecommitdiffstats
path: root/browser
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-03 08:48:48 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-03 08:48:48 -0500
commitc6856f968b8c85502f14c6c3412b00a05fc0c0de (patch)
treec0720fdf31018c72fcb69134f2e9667d16970c3a /browser
parent36f73c8cd27e62cbd3e85939d6fe11a240e3416f (diff)
parent1e1fb5ea2504e548bc17521bdb273c9e59b9cf01 (diff)
downloadUXP-c6856f968b8c85502f14c6c3412b00a05fc0c0de.tar
UXP-c6856f968b8c85502f14c6c3412b00a05fc0c0de.tar.gz
UXP-c6856f968b8c85502f14c6c3412b00a05fc0c0de.tar.lz
UXP-c6856f968b8c85502f14c6c3412b00a05fc0c0de.tar.xz
UXP-c6856f968b8c85502f14c6c3412b00a05fc0c0de.zip
Merge branch 'master' into configurebuild-work
Diffstat (limited to 'browser')
-rw-r--r--browser/branding/official/pref/firefox-branding.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js
index 52aaa4f50..35be87314 100644
--- a/browser/branding/official/pref/firefox-branding.js
+++ b/browser/branding/official/pref/firefox-branding.js
@@ -32,3 +32,5 @@ pref("app.update.badgeWaitTime", 0);
// Number of usages of the web console or scratchpad.
// If this is less than 5, then pasting code into the web console or scratchpad is disabled
pref("devtools.selfxss.count", 0);
+
+pref("app.update.enabled", false);