/* CTF-Stuff */ mehr CTFs im Winter

[stratum0-wiki.git] / Termine.mw

diff --git a/Termine.mw b/Termine.mw
index 40b5209..9645b0a 100644 (file)
--- a/Termine.mw
+++ b/Termine.mw
@@ -74,12 +74,16 @@ https://stratum0.org/kalender/termine.ics
 |-
 |[http://asis-ctf.ir/ ASIS CTF Finals 2014], Platz 7 || 11.10.2014 08:30 - 13.10.2014 08:30 ||
 |-
 |-
 |[http://asis-ctf.ir/ ASIS CTF Finals 2014], Platz 7 || 11.10.2014 08:30 - 13.10.2014 08:30 ||
 |-

-|[http://dctf.defcamp.ro/ Defcamp CTF Qualification 2014] || 18.10.2014 13:00 - 20.10.2014 13:00 ||
+|[http://dctf.defcamp.ro/ Defcamp CTF Qualification 2014], Platz 10 || 18.10.2014 13:00 - 20.10.2014 13:00 ||

 |-
 |-

-|[http://2014.hack.lu/index.php/CaptureTheFlag Hack.lu CTF 2014] || 21.10.2014 10:00 - 23.10.2014 10:00 ||
+|[http://2014.hack.lu/index.php/CaptureTheFlag Hack.lu CTF 2014], Platz 15 || 21.10.2014 10:00 - 23.10.2014 10:00 ||
+|-
+|[https://9447.plumbing/ 9447 Security Society CTF 2014] || 29.11.2014 12.00 - 01.12.2014 00:00 ||

 |-
 |[http://ghostintheshellcode.com/ Ghost in the Shellcode Teaser 2015] || 13.12.2014 16:00 - 14.12.2014 17:00 ||
 |-
 |-
 |[http://ghostintheshellcode.com/ Ghost in the Shellcode Teaser 2015] || 13.12.2014 16:00 - 14.12.2014 17:00 ||
 |-

+|[http://ructf.org/e/2014/ RuCTFE 2014] || 20.12.2014 05:00 - 20.12.2014 14:00 ||
+|-

 |[http://ghostintheshellcode.com/ Ghost in the Shellcode 2015] || 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://ghostintheshellcode.com/ Ghost in the Shellcode 2015] || 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 ||


@@ -190,5 +194,5 @@ https://stratum0.org/kalender/termine.ics
 {| class="prettytable"
 ! Event !! Termin !! Im Zeitraum
 |-
 {| class="prettytable"
 ! Event !! Termin !! Im Zeitraum
 |-

-| Ktrasks Geburtstagsparty|| 31.10.2014 19:00 ||
+| Ktrasks Geburtstagsparty|| 31.10.2014 19:00-23:59 ||

 |}
 |}