diff options
| author | anonym <anonym@riseup.net> | 2015-08-07 15:25:41 +0200 |
|---|---|---|
| committer | anonym <anonym@riseup.net> | 2015-08-07 15:25:41 +0200 |
| commit | a7419ab4bebc4f844e460f460d7d3ab487f81f6a (patch) | |
| tree | c5004e7ab32ba7a477524aad6bcd0e50374bb3e3 /config/APT_overlays.d | |
| parent | a2fd0ea3fddd79195673db01dd23f49a45ee7eb0 (diff) | |
| parent | 502edfcbcf680f3dfb5cceb31fa00779e378e238 (diff) | |
Merge remote-tracking branch 'origin/testing' into feature/jessie
Conflicts:
config/base_branch
config/chroot_apt/preferences
features/totem.feature
Diffstat (limited to 'config/APT_overlays.d')
| -rw-r--r-- | config/APT_overlays.d/feature-8471-32-bit-uefi | 0 | ||||
| -rw-r--r-- | config/APT_overlays.d/feature-9742-tor-0.2.6.10 | 0 | ||||
| -rw-r--r-- | config/APT_overlays.d/feature-installer-for-1.5 | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/config/APT_overlays.d/feature-8471-32-bit-uefi b/config/APT_overlays.d/feature-8471-32-bit-uefi deleted file mode 100644 index e69de29..0000000 --- a/config/APT_overlays.d/feature-8471-32-bit-uefi +++ /dev/null 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 deleted file mode 100644 index e69de29..0000000 --- a/config/APT_overlays.d/feature-9742-tor-0.2.6.10 +++ /dev/null diff --git a/config/APT_overlays.d/feature-installer-for-1.5 b/config/APT_overlays.d/feature-installer-for-1.5 deleted file mode 100644 index e69de29..0000000 --- a/config/APT_overlays.d/feature-installer-for-1.5 +++ /dev/null |