Merge branch 'main' into neue_datenschutzerklaerung

Merge pull request 'Add bbb channel link' (#63 ) from bbb into main
Reviewed-on: #63
2021-06-13 10:47:27 +02:00 · 2021-06-10 00:16:45 +02:00 · 2021-06-10 00:16:13 +02:00 · 2021-06-09 22:53:29 +02:00
2 changed files with 15 additions and 1 deletions
--- a/content/bbb/contents.lr
+++ b/content/bbb/contents.lr
@ -0,0 +1,13 @@
 _model: page
 ---
 title: Meetup
 ---
 body:
 Jeden Mittwoch treffen wir uns ab 21 Uhr zum Jour-Fixe. Hier plaudern wir nicht nur über die Genossenschaft und beantworten untereinander unsere Fragen, sondern verbringen auch einen gemütlichen Abend miteinander. So gut das in diesen Zeiten eben geht.
 Auf [bbb.cyber4edu.org/b/l3d-ecy-qks-ojk](https://bbb.cyber4edu.org/b/l3d-ecy-qks-ojk) findet ihr unseren BigBlueButton Raum.
 Danke fürs Hosting an die [infra.run](https://infra.run/).
 ---
 meta_description: Wir treffen uns Wöchentlich um uns Miteinander auszutauschen. Komm doch auch mal Vorbei.
--- a/databags/navigation.json
+++ b/databags/navigation.json
@ -21,7 +21,8 @@
    "list_childs": true,
    "items": {
      "Blog": "/blog",
-      "Podcast": "/podcast"
+      "Podcast": "/podcast",
      "Meetup": "/bbb"
      }
  },
  "Kontakt": {
Author	SHA1	Message	Date
muli	1a7b496b50	Merge branch 'main' into neue_datenschutzerklaerung All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2021-06-13 10:47:27 +02:00
L3D	1804adde4c	Merge pull request 'Add bbb channel link' (#63 ) from bbb into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #63	2021-06-10 00:16:45 +02:00
L3D	5138647342	Add bbb channel link All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2021-06-10 00:16:13 +02:00
rev0lverheld	e674ac7352	Merge pull request 'Neue Datenschutzerklärung gemäß Vorgabe vom Vorstand' (#61 ) from neue_datenschutzerklaerung into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #61	2021-06-09 22:53:29 +02:00