summaryrefslogtreecommitdiffstats
path: root/config/APT_overlays.d
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-08-05 16:16:51 +0200
committeranonym <anonym@riseup.net>2015-08-05 16:16:51 +0200
commitf30ae4e5d79667542deb491d541ed5e05f6c40ec (patch)
tree9c4f83dec6c84a94178afc94673702b20d86b293 /config/APT_overlays.d
parent26731de8e304137da7d4036af423638fcacaeeb1 (diff)
parent0525d220d668e1fa39ae10142661452389ce4d43 (diff)
Merge remote-tracking branch 'origin/devel' into bugfix/8007-AppArmor-hardening
Conflicts: features/evince.feature features/images/TorBrowserUnableToOpen.png features/torified_browsing.feature features/totem.feature
Diffstat (limited to 'config/APT_overlays.d')
-rw-r--r--config/APT_overlays.d/feature-installer-for-1.5 (renamed from config/APT_overlays.d/feature-9130-tails-installer-notify-on-smal-device)0
1 files changed, 0 insertions, 0 deletions
diff --git a/config/APT_overlays.d/feature-9130-tails-installer-notify-on-smal-device b/config/APT_overlays.d/feature-installer-for-1.5
index e69de29..e69de29 100644
--- a/config/APT_overlays.d/feature-9130-tails-installer-notify-on-smal-device
+++ b/config/APT_overlays.d/feature-installer-for-1.5