summaryrefslogtreecommitdiffstats
path: root/config/APT_overlays.d
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-08-05 20:09:07 +0200
committeranonym <anonym@riseup.net>2015-08-05 20:09:07 +0200
commita2fd0ea3fddd79195673db01dd23f49a45ee7eb0 (patch)
treedcfb36e74ab74f40159dee038c1a83487e8b2663 /config/APT_overlays.d
parent4bf7742d903159a466b4512b23f99737c43d37d1 (diff)
parent0a4dd67c9d879895bf0ced9228d602eac4b5db61 (diff)
Merge remote-tracking branch 'origin/devel' into feature/jessie
Conflicts: features/images/I2P_router_console.png features/images/TailsInstallerNoDevice.png features/images/TorBrowserAddressBar.png features/images/USBSuggestsInstall.png features/images/UnsafeBrowserAdvancedSettings.png features/images/UnsafeBrowserEditPreferences.png features/images/UnsafeBrowserProxyRefused.png features/images/UnsafeBrowserWindow.png features/step_definitions/unsafe_browser.rb
Diffstat (limited to 'config/APT_overlays.d')
-rw-r--r--config/APT_overlays.d/feature-8471-32-bit-uefi (renamed from config/APT_overlays.d/feature-9130-tails-installer-notify-on-smal-device)0
-rw-r--r--config/APT_overlays.d/feature-9742-tor-0.2.6.100
-rw-r--r--config/APT_overlays.d/feature-installer-for-1.50
3 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-8471-32-bit-uefi
index e69de29..e69de29 100644
--- a/config/APT_overlays.d/feature-9130-tails-installer-notify-on-smal-device
+++ b/config/APT_overlays.d/feature-8471-32-bit-uefi
diff --git a/config/APT_overlays.d/feature-9742-tor-0.2.6.10 b/config/APT_overlays.d/feature-9742-tor-0.2.6.10
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/feature-9742-tor-0.2.6.10
diff --git a/config/APT_overlays.d/feature-installer-for-1.5 b/config/APT_overlays.d/feature-installer-for-1.5
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/feature-installer-for-1.5