Merge pull request #37 from Le1b1/patch-14

Add NSA in July
2015-07-08 08:04:57 +02:00 · 2015-07-08 08:04:57 +02:00 · 44554cdb07
commit 44554cdb07
parent 5e1eeea654 30c1781a68
1 changed files with 10 additions and 0 deletions
--- a/content/_data/chaosevents.yaml
+++ b/content/_data/chaosevents.yaml
@ -100,6 +100,16 @@ events:
      plz: 70174
      ort: Stuttgart
  -
+    startdate: 2015-07-15T19:00:00Z
+    duration: 2h	
+    title: "Neue Stuttgarter Abendgespräche"
+    url: http://www.abendgespraeche.de/talks.html
+    location:
+      name: Literaturhaus Stuttgart
+      strasse: Breitscheidstraße 4
+      plz: 70174
+      ort: Stuttgart
+  - 
    startdate: 2015-08-13
    duration: 5d
    title: "Chaos Communication Camp"