Commit 4502d4b0 authored by kay's avatar kay

Merge branch 'events' into 'master'

updated events

See merge request !180
parents 0158b913 c75e6982
......@@ -4,30 +4,9 @@
"name_de": "Reguläre Treffen",
"name_en": "Regular Meetings",
"events": [
{
"start": "2018-05-22 19:00",
"duration": "3h",
"location": "Güterstrasse 8",
"summary_en": "The weekly meeting of the Chaostreff Bern",
"summary_de": "Das wöchentliche Treffen des Chaostreff Bern",
"title": "Chaostreff Bern",
"url_de": "/de/treff.html",
"url_en": "/en/treff.html",
"location_url": "treff.html#gueterstrasse"
},
{
"start": "2018-05-29 19:00",
"duration": "3h",
"location": "Güterstrasse 8",
"summary_en": "The weekly meeting of the Chaostreff Bern",
"summary_de": "Das wöchentliche Treffen des Chaostreff Bern",
"title": "Chaostreff Bern",
"url_de": "/de/treff.html",
"url_en": "/en/treff.html",
"location_url": "treff.html#gueterstrasse"
},
{
"start": "2018-06-05 19:00",
"start": "2018-06-19 19:00",
"duration": "3h",
"location": "Güterstrasse 8",
"summary_en": "The weekly meeting of the Chaostreff Bern",
......@@ -37,8 +16,9 @@
"url_en": "/en/treff.html",
"location_url": "treff.html#gueterstrasse"
},
{
"start": "2018-06-12 19:00",
"start": "2018-06-26 19:00",
"duration": "3h",
"location": "Güterstrasse 8",
"summary_en": "The weekly meeting of the Chaostreff Bern",
......@@ -48,8 +28,9 @@
"url_en": "/en/treff.html",
"location_url": "treff.html#gueterstrasse"
},
{
"start": "2018-06-19 19:00",
"start": "2018-07-03 19:00",
"duration": "3h",
"location": "Güterstrasse 8",
"summary_en": "The weekly meeting of the Chaostreff Bern",
......@@ -59,8 +40,9 @@
"url_en": "/en/treff.html",
"location_url": "treff.html#gueterstrasse"
},
{
"start": "2018-06-26 19:00",
"start": "2018-07-10 19:00",
"duration": "3h",
"location": "Güterstrasse 8",
"summary_en": "The weekly meeting of the Chaostreff Bern",
......@@ -70,22 +52,24 @@
"url_en": "/en/treff.html",
"location_url": "treff.html#gueterstrasse"
}
]
},
{
"name_de": "Spezielle Events",
"name_en": "Special Events",
"events": [
{
"start": "2018-06-15 16:00",
"duration": "3d",
"location": "Villa Ritter, 2502 Biel/Bienne",
"summary_en": "Cosin is a yearly chaotic event in Switzerland. The content ranges from technical and political, to social and cultural. ",
"summary_de": "Chaos Singularity (CoSin) ist ein jährlicher Event des Schweizer Chaos. Der Inhalt erstreckt sich über Technik und Politik zu Kunst und Kultur. ",
"title_de": "Chaos Singularity 2018",
"title_en": "Chaos Singularity 2018",
"location_url": "https://www.cosin.ch"
}
{
"start": "2018-06-15 16:00",
"duration": "3d",
"location": "Villa Ritter, 2502 Biel/Bienne",
"summary_en": "Cosin is a yearly chaotic event in Switzerland. The content ranges from technical and political, to social and cultural. ",
"summary_de": "Chaos Singularity (CoSin) ist ein jährlicher Event des Schweizer Chaos. Der Inhalt erstreckt sich über Technik und Politik zu Kunst und Kultur. ",
"title_de": "Chaos Singularity 2018",
"title_en": "Chaos Singularity 2018",
"location_url": "https://www.cosin.ch"
}
]
}
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment