summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-03-01 14:46:54 +0100
committerTails developers <amnesia@boum.org>2012-03-01 14:46:54 +0100
commitf6a9b21c33403c7789f3b407a913b8bbb2f51861 (patch)
tree545e366a603eb954cf2a4cc9d6a1c9e14296530c
parent5020cffa7839f91ab19a1d247a3cc2bde5b802f3 (diff)
parentbdf941f311458af95b4aba2acf1609ec74edecb0 (diff)
Merge branch 'stable' of ssh://webmasters.boum.org/~/wiki into stable
-rw-r--r--config/chroot_local-includes/etc/iceweasel/profile/user.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/chroot_local-includes/etc/iceweasel/profile/user.js b/config/chroot_local-includes/etc/iceweasel/profile/user.js
index 1e95931..169c565 100644
--- a/config/chroot_local-includes/etc/iceweasel/profile/user.js
+++ b/config/chroot_local-includes/etc/iceweasel/profile/user.js
@@ -1,5 +1,5 @@
user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-user_pref("capability.policy.maonoscript.sites", " https://auk.riseup.net https://mail.riseup.net https://swift.riseup.net https://tern.riseup.net https://webmail.no-log.org addons.mozilla.org about: about:addons about:blank about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: file:// https://webmail.boum.org resource:");
+user_pref("capability.policy.maonoscript.sites", " https://auk.riseup.net https://mail.riseup.net https://swift.riseup.net https://tern.riseup.net https://webmail.no-log.org addons.mozilla.org about: about:addons about:blank about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: https://webmail.boum.org resource:");
user_pref("extensions.adblockplus.currentVersion", "2.0.3");
user_pref("extensions.adblockplus.showinaddonbar", false);
user_pref("extensions.adblockplus.showintoolbar", false);
@@ -73,4 +73,4 @@ user_pref("noscript.showUntrusted", false);
user_pref("noscript.STS.enabled", false);
user_pref("noscript.subscription.lastCheck", -142148139);
user_pref("noscript.temp", "");
-user_pref("noscript.untrusted", "google-analytics.com file://");
+user_pref("noscript.untrusted", "google-analytics.com");