summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-11-27 14:29:46 +0000
committerintrigeri <intrigeri@boum.org>2018-11-27 14:29:46 +0000
commit7d3d924581b51a7a56a967c73a81678aa198e134 (patch)
tree38580f86e18e4ee9319ed72e0fa7afa0dbfb1553
parent9055adb192da3aac63b5560585a784b3d33b027c (diff)
parent2a9a679fb1407a54a0b83a121836252574c3fa58 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--debian/changelog6
-rw-r--r--wiki/src/contribute/working_together/roles/debian_maintainer.mdwn5
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 47e60ed..ed4b83b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tails (3.11) UNRELEASED; urgency=medium
+
+ * Dummy entry for next release.
+
+ -- Cyril Brulebois <ckb@riseup.net> Thu, 25 Oct 2018 04:11:36 +0200
+
tails (3.10.1) unstable; urgency=medium
* Declare that Enigmail is compatible with Thunderbird 60.*.
diff --git a/wiki/src/contribute/working_together/roles/debian_maintainer.mdwn b/wiki/src/contribute/working_together/roles/debian_maintainer.mdwn
index 7bb10b7..a1d8d38 100644
--- a/wiki/src/contribute/working_together/roles/debian_maintainer.mdwn
+++ b/wiki/src/contribute/working_together/roles/debian_maintainer.mdwn
@@ -47,6 +47,5 @@ Calendar
========
* [Debian release schedule](https://www.debian.org/releases/)
-* [Ubuntu release schedule](https://wiki.ubuntu.com/ReleaseSchedule)
- * Upcoming: BionicBeaver, 18.04, April 26th 2018
-
+* [Ubuntu release schedule](https://wiki.ubuntu.com/Release), generally
+ in April and October