X-Git-Url: https://git.rohieb.name/stratum0-wiki.git/blobdiff_plain/547f51b62493d9ad23356278821e2f8a9c5cbacb..99fc6f83337ef382fd3931f4fba84e1d4a0c691b:/Termine.mw?ds=inline

diff --git a/Termine.mw b/Termine.mw
index 4fa90668f..f3ed83bf9 100644
--- a/Termine.mw
+++ b/Termine.mw
@@ -104,6 +104,8 @@ Hinweise zur Syntax:
 |-
 | [https://www.nuitduhack.com/ Nuit du Hack CTF Finals 2015] in Paris, Platz 1 || 20.06.2015 20:00 - 21.06.2015 06:00 ||
 |-
+| [https://www.nuitduhack.com/ Nuit du Hack CTF Finals 2016] in Paris, Platz 1 || 02.07.2016 21:00 - 03.07.2016 06:00 ||
+|-
 | [http://plaidctf.com/ Plaid CTF 2015], Platz 2 || 17.04.2015 23:00 - 19.04.2015 23:00 ||
 |-
 | [http://polictf.it/ PoliCTF 2015], Platz 3 || 10.07.2015 11:00 - 12.07.2015 11:00 ||
@@ -152,7 +154,9 @@ Hinweise zur Syntax:
 |-
 | [[Captain's Log|Captain's Log Spezial]] ||  07.04.2016 19:30 ||
 |-
-| [[Captain's Log]] || Do/2, 19:30 - 23:30 || 09.06.2016 - 31.12.2016
+| [[Captain's Log]] || Do/2, 19:30 - 23:30 || 09.06.2016 - 23.06.2016
+|-
+| [[Captain's Log]] || Do/2, 19:30 - 23:30 || 21.07.2016 - 31.12.2016
 |}
 
 == Copter ==
@@ -260,6 +264,10 @@ Hinweise zur Syntax:
 |-
 | [[Vorträge]] || 14.06.2016 19:00 ||
 |-
+| [[Vorträge]] || 14.07.2016 19:00 ||
+|-
+| [[Vorträge]] || 14.08.2016 19:00 ||
+|-
 |}
 
 == Workshops ==