summaryrefslogtreecommitdiffstats
path: root/config/APT_overlays.d
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-06-12 19:59:46 +0200
committeranonym <anonym@riseup.net>2015-06-12 19:59:46 +0200
commitac0c4c92b3055015d349a935e0e7189ebc758a54 (patch)
treebada000cd2e6e9c0daa3b334c3f5b731bbaced6b /config/APT_overlays.d
parent4e2cba27482444ebc41fc43bb09e9aa9843b15ff (diff)
parent9ff19766e1aca75a4ae99df6769cdd817637d892 (diff)
Merge remote-tracking branch 'origin/devel' into feature/jessie
Conflicts: features/step_definitions/erase_memory.rb wiki/src/contribute/design/Time_syncing.mdwn
Diffstat (limited to 'config/APT_overlays.d')
-rw-r--r--config/APT_overlays.d/bugfix-7249-truncated-notifications0
1 files changed, 0 insertions, 0 deletions
diff --git a/config/APT_overlays.d/bugfix-7249-truncated-notifications b/config/APT_overlays.d/bugfix-7249-truncated-notifications
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/bugfix-7249-truncated-notifications