Moved stuff into archive

[stratum0-wiki.git] / Termine.mw

diff --git a/Termine.mw b/Termine.mw
index b26b430..31fddd6 100644 (file)
--- a/Termine.mw
+++ b/Termine.mw
@@ -27,7 +27,7 @@ https://stratum0.org/kalender/termine.ics
 |-
 | Vorstandsübergabe || 17.12.2014 19:00 ||
 |-
 |-
 | Vorstandsübergabe || 17.12.2014 19:00 ||
 |-

-| Stromabschaltung || 12.12.2014, 7:30-11:00 ||
+| Stromabschaltung || 12.12.2014 7:30-11:00 ||

 |}
 
 == Easterhegg Events ==
 |}
 
 == Easterhegg Events ==


@@ -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 ||
 |-
 |-
 |[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://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 ==
 |}
 
 == Anime-Referat ==


@@ -146,7 +150,7 @@ https://stratum0.org/kalender/termine.ics
 |-
 |[[Vegan Academy]] ||Mo/2 19.00 || 3.11.2014 - 14.12.2014
 |-
 |-
 |[[Vegan Academy]] ||Mo/2 19.00 || 3.11.2014 - 14.12.2014
 |-

-|[[Vegan Academy]] ||Mo/2 19.00 || 20.01.2015 - 30.06.2015
+|[[Vegan Academy]] ||Di/2 19.00 || 20.01.2015 - 30.06.2015

 |}
 
 == CoderDojo ==
 |}
 
 == CoderDojo ==