Commit 0eaaf2bd authored by Niklaus Hofer's avatar Niklaus Hofer
Browse files

Merge branch 'notify' into 'master' 

Protokoll 2019-06-04: Add warning about the protocol not being final

See merge request chaostreffbern/chaostreffbern_website!213
parents 8c75d0b1 391cf7c8

content/events.json

+6 −6
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
      "name_en": "Regular Meetings",

      "events": [

        {

          "start": "2019-06-11 19:00",

          "start": "2019-06-18 19:00",

          "duration": "3h",

          "location": "Kyburgstrasse 13, 3013 Bern",

          "summary_en": "The weekly meeting of the Chaostreff Bern",
@@ -16,7 +16,7 @@ 
          "location_url": "hackerspace.html"

        },

        {

          "start": "2019-06-18 19:00",

          "start": "2019-06-25 19:00",

          "duration": "3h",

          "location": "Kyburgstrasse 13, 3013 Bern",

          "summary_en": "The weekly meeting of the Chaostreff Bern",
@@ -27,7 +27,7 @@ 
          "location_url": "hackerspace.html"

        },

        {

          "start": "2019-06-25 19:00",

          "start": "2019-07-02 19:00",

          "duration": "3h",

          "location": "Kyburgstrasse 13, 3013 Bern",

          "summary_en": "The weekly meeting of the Chaostreff Bern",
@@ -38,7 +38,7 @@ 
          "location_url": "hackerspace.html"

        },

        {

          "start": "2019-07-02 19:00",

          "start": "2019-07-09 19:00",

          "duration": "3h",

          "location": "Kyburgstrasse 13, 3013 Bern",

          "summary_en": "The weekly meeting of the Chaostreff Bern",
@@ -49,7 +49,7 @@ 
          "location_url": "hackerspace.html"

        },

        {

          "start": "2019-07-09 19:00",

          "start": "2019-07-16 19:00",

          "duration": "3h",

          "location": "Kyburgstrasse 13, 3013 Bern",

          "summary_en": "The weekly meeting of the Chaostreff Bern",
@@ -60,7 +60,7 @@ 
          "location_url": "hackerspace.html"

        },

        {

          "start": "2019-07-16 19:00",

          "start": "2019-07-23 19:00",

          "duration": "3h",

          "location": "Kyburgstrasse 13, 3013 Bern",

          "summary_en": "The weekly meeting of the Chaostreff Bern",

content/pages/de/protokolle/2019-06-04.md

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ Slug: protokoll_gv_2019-06-04 
Date: 2019-06-05

Lang: de



<center>**!!! Das Protokoll ist durch die GV noch nicht abgenommen und als temporär zu betrachten !!!**</center>



Die Generalversammlung startet um 19:30 Uhr.



## Begrüssung und Vorstellung