Merge pull request #53 from Le1b1/patch-24

Add events
2016-03-30 09:35:53 +02:00 · 2016-03-30 09:35:53 +02:00 · ce56f9744d
commit ce56f9744d
parent 43851584e0 4c74ddc253
1 changed files with 20 additions and 1 deletions
--- a/content/_data/chaosevents.yaml
+++ b/content/_data/chaosevents.yaml
@ -126,4 +126,23 @@ events:
    location:
      name: CCH
      ort: Hamburg
-
+  -
+    startdate: 2016-05-26
+    duration: 4d
+    title: "GPN16"
+    url: https://entropia.de/GPN16
+    location:
+      name: Hochschule für Gestaltung (HfG)
+      ort: Karlsruhe
+      lon: 49.002196
+      lat: 8.38411
+  -
+    startdate: 2016-06-16
+    duration: 3d
+    title: "5. No-Spy Konferenz"
+    url: https://no-spy.org/
+    location:
+      name: Literaturhaus Stuttgart
+      strasse: Breitscheidstraße 4
+      plz: 70174
+      ort: Stuttgart