From: Comawill <Comawill@stratum0.org/mediawiki/>
Date: Sun, 18 Jan 2015 23:12:34 +0000 (+0000)
Subject: Mehr CTF Updates
X-Git-Url: http://git.rohieb.name/stratum0-wiki.git/commitdiff_plain/7f4903d1cf2b1db51543452b6bcfbf6927b11fca

Mehr CTF Updates
---

diff --git a/Termine.mw b/Termine.mw
index 4fd5103f4..73b1964f3 100644
--- a/Termine.mw
+++ b/Termine.mw
@@ -107,9 +107,13 @@ https://stratum0.org/kalender/termine.ics
 |-
 |[https://teaser.insomnihack.ch/ Insomni'hack 2015 Teaser], Platz 3 || 10.01.2015 10:00 - 11.01.2015 22:00 ||
 |-
-|[http://ghostintheshellcode.com/ Ghost in the Shellcode 2015] || 16.01.2015 21:30 - 18.01.2015 18:30 ||
+|[http://ghostintheshellcode.com/ Ghost in the Shellcode 2015], Platz 20 || 16.01.2015 21:30 - 18.01.2015 18:30 ||
 |-
 |[http://bostonkeyparty.net/ Boston Key Party CTF 2015] || 28.02.2015 01:00 - 02.03.2015 01:00 ||
+|-
+|[http://www.insomnihack.ch/ Insomni'hack 2015] in Genf || 20.03.2015 18.00 - 21.03.2015 04:00 ||
+|-
+|[http://plaidctf.com/ Plaid CTF 2015] || 17.04.2015 23:00 - 19.04.2015 23:00 ||
 |}
 
 == Anime-Referat ==