summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-09-15 09:40:37 +0000
committerintrigeri <intrigeri@boum.org>2019-09-15 09:40:37 +0000
commitc67a1d87e12e5f5db9ed2a1eb663b787078485d2 (patch)
tree0ac69e28bc0e0a3a7e13833eae5454c5783402f2
parent571ed4a1d35ca99964feed0e111e1574d2aa5699 (diff)
parentb856639adf6ed9e1c86876f26c00d1de47a22ec0 (diff)
Merge branch 'bugfix/17057-ftbfs-ublock-patch' into bugfix/16471-drop-time-synchronization-hacks+force-all-testsbugfix/16471-drop-time-synchronization-hacks+force-all-tests
-rw-r--r--config/chroot_local-includes/usr/share/tails/uBlock-disable-autoUpdate.diff2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/chroot_local-includes/usr/share/tails/uBlock-disable-autoUpdate.diff b/config/chroot_local-includes/usr/share/tails/uBlock-disable-autoUpdate.diff
index 831a7e4..44470f8 100644
--- a/config/chroot_local-includes/usr/share/tails/uBlock-disable-autoUpdate.diff
+++ b/config/chroot_local-includes/usr/share/tails/uBlock-disable-autoUpdate.diff
@@ -1,6 +1,6 @@
--- a/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/uBlock0@raymondhill.net/js/background.js 2019-07-07 21:57:21.000000000 +0000
+++ b/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/uBlock0@raymondhill.net/js/background.js 2019-07-08 10:21:49.658415914 +0000
-@@ -73,7 +73,7 @@
+@@ -69,7 +69,7 @@
userSettings: {
advancedUserEnabled: false,
alwaysDetachLogger: true,