summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-06-08 11:01:20 +0200
committeranonym <anonym@riseup.net>2016-06-08 11:01:20 +0200
commit4c5ede48860857c31380ea4c6958972ead340893 (patch)
treede697c1c03aafeb4ece8b2b6df3427504d36f46b
parent11d8c298b5008fdfb257bce48251a45653c19443 (diff)
parent93de3565bddbb95b09ab97e42276cb20c8fded42 (diff)
Merge branch 'master' into stable
-rw-r--r--debian/changelog6
1 files changed, 0 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 11e0c73..6d85eab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -195,12 +195,6 @@ tails (2.4) unstable; urgency=medium
-- Tails developers <tails@boum.org> Mon, 06 Jun 2016 20:10:56 +0200
-tails (2.3.1) UNRELEASED; urgency=medium
-
- * Dummy entry.
-
- -- anonym <anonym@riseup.net> Tue, 26 Apr 2016 18:41:16 +0200
-
tails (2.3) unstable; urgency=medium
* Security fixes