summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/calendar.mdwn
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2017-12-18 23:58:05 +0100
committerbertagaz <bertagaz@ptitcanardnoir.org>2017-12-18 23:58:05 +0100
commit05c5f95bc04e1f84e31f57b11a9503375075577a (patch)
tree8c35d06ac943665e4787ed70b651c309702c7633 /wiki/src/contribute/calendar.mdwn
parent15eb5d7ad7627916f1de3683071a79bb4b45f640 (diff)
parent1db04699bd95dccbee96e0cc51b0fc233fce75a8 (diff)
Merge remote-tracking branch 'origin/stable' into bugfix/10494-retry-curl-in-htpdatebugfix/10494-retry-curl-in-htpdate
Diffstat (limited to 'wiki/src/contribute/calendar.mdwn')
-rw-r--r--wiki/src/contribute/calendar.mdwn41
1 files changed, 17 insertions, 24 deletions
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index e47900d..4b5b25a 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,40 +1,33 @@
[[!meta title="Calendar"]]
-* 2017-10-02, 14:00 (Berlin time): Reproducible builds meeting
+* 2018-01-04, 16:00 (Berlin time): CI team meeting
-* 2017-10-02, 16:00 (Berlin time): CI team meeting
+* 2018-01-05, 14:00 (Berlin time): Additional Software team meeting
-* 2017-11-02, 16:00 (Berlin time): CI team meeting
+* 2018-01-23: Release 3.5 (Firefox 52.6, bugfix release) — anonym is the RM
-* 2017-11-15:
- - All feature branches targeting Tails 3.3 should be merged into
- the `stable` branch by noon, CET. I'm open to make exceptions
- if you can be online and responsive during that afternoon, but
- ask me first!
- - Build and upload Tails 3.3.
- - Start testing Tails 3.3 during late CET if building the image
- went smoothly.
+* 2018-02-01, 16:00 (Berlin time): CI team meeting
-* 2017-11-16:
- - Finish testing Tails 3.3 by the afternoon, CET.
- - Release Tails 3.3.
+* 2018-02-05, 14:00 (Berlin time): Additional Software team meeting
-* 2017-12-07, 16:00 (Berlin time): CI team meeting
+* 2018-03-05, 14:00 (Berlin time): Additional Software team meeting
-* 2018-01-04, 16:00 (Berlin time): CI team meeting
+* 2018-03-13: Release 3.6 (Firefox 52.7, major release) — bertagaz is the RM
-* 2018-01-16: Release 3.4? (Firefox 52.6)
+* 2018-04-05, 14:00 (Berlin time): Additional Software team meeting
-* 2018-02-01, 16:00 (Berlin time): CI team meeting
+* 2018-05-04, 14:00 (Berlin time): Additional Software team meeting
+
+* 2018-05-08: Release 3.7 (Firefox 52.8, bugfix release) — bertagaz is the RM
-* 2018-03-06: Release 3.5? (Firefox 52.7)
+* 2018-06-05, 14:00 (Berlin time): Additional Software team meeting
-* 2018-05-01: Release 3.6? (Firefox 52.8)
+* 2018-07-03: Release 3.8 (Firefox 59.2, major release) — intrigeri is the RM
-* 2018-06-26: Release 3.7? (Firefox 59.2)
+* 2018-07-05, 14:00 (Berlin time): Additional Software team meeting
-* 2018-08-21: Release 3.8? (Firefox 59.3)
+* 2018-08-28: Release 3.9 (Firefox 59.3, bugfix release) — anonym is the RM
-* 2018-10-16: Release 3.9? (Firefox 59.4)
+* 2018-10-23: Release 3.10 (Firefox 59.4, major release) — anonym is the RM
-* 2018-11-27: Release 3.10? (Firefox 59.5)
+* 2018-11-27: Release 3.11 (Firefox 59.5, bugfix release) — anonym is the RM