summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-01-11 20:34:50 +0100
committeranonym <anonym@riseup.net>2016-01-11 20:34:50 +0100
commit328a263baf54bc697966a49eaaef780c498bb486 (patch)
tree9b76919f776a8b9f32c616288e96881b1e4df8e2
parent51a7dfa0bbccc9f81836326dd8be4cebe96955f5 (diff)
parent8b224ba989dbc3bc3dd3f3f46943fa5f08cf438e (diff)
Merge remote-tracking branch 'origin/master' into devel
-rw-r--r--wiki/src/contribute/calendar.mdwn6
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2015_12.mdwn (renamed from wiki/src/blueprint/SponsorS/reports/2015_12.mdwn)0
2 files changed, 0 insertions, 6 deletions
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 33c5621..0b49f7c 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,11 +1,5 @@
[[!meta title="Calendar"]]
-* 2015-12-11: feature freeze of Tails 2.0
-
-* 2016-01-09: build, upload and test Tails 1.8.2
-
-* 2016-01-10: release Tails 1.8.2
-
* 2016-01-11:
- Build and upload Tails 2.0~rc1.
- Start testing Tails 2.0~rc1 during late CET if building the image
diff --git a/wiki/src/blueprint/SponsorS/reports/2015_12.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2015_12.mdwn
index 5d03df4..5d03df4 100644
--- a/wiki/src/blueprint/SponsorS/reports/2015_12.mdwn
+++ b/wiki/src/contribute/reports/SponsorS/2015/2015_12.mdwn