Merge pull request #60 from Le1b1/patch-6

#6NSK hinzugefügt
2016-07-19 15:41:18 +02:00 · 2016-07-19 15:41:18 +02:00 · 64c39050b7
commit 64c39050b7
parent e35d16afb2 82c58017e4
1 changed files with 10 additions and 0 deletions
--- a/content/_data/chaosevents.yaml
+++ b/content/_data/chaosevents.yaml
@ -146,3 +146,13 @@ events:
      strasse: Breitscheidstraße 4
      plz: 70174
      ort: Stuttgart
+  -
+    startdate: 2017-05-19
+    duration: 3d
+    title: "6. No-Spy Konferenz"
+    url: https://no-spy.org/
+    location:
+      name: Literaturhaus Stuttgart
+      strasse: Breitscheidstraße 4
+      plz: 70174
+      ort: Stuttgart