From 953086df478ef9e9692312499ec255fcead0c40c Mon Sep 17 00:00:00 2001
From: Linus Neumann <git_commits@linus-neumann.de>
Date: Wed, 7 Nov 2018 13:47:21 +0100
Subject: Restrukturisierung und Merge

---
 content/pages/security/security.en.md | 34 ++++++++++++++++++++++++++++++++++
 content/pages/security/security.md    | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 content/pages/security/security.en.md
 create mode 100644 content/pages/security/security.md

(limited to 'content/pages/security')

diff --git a/content/pages/security/security.en.md b/content/pages/security/security.en.md
new file mode 100644
index 0000000..c6f4d60
--- /dev/null
+++ b/content/pages/security/security.en.md
@@ -0,0 +1,34 @@
+Title: Security Team
+Longtitle: 35C3 Security Team
+URL: security/index.en.html
+save_as: security/index.en.html
+Slug: security
+Lang: en
+Template: page
+sortorder: 01
+Date: 2018-11-01
+
+Our security team offers help with all kinds of conflict and cares for your security - tightly collaborating with CERT and Awareness Team. Always there for you with open eyes and ears.
+
+## Contact
+
+* [DECT]({filename}../dect.en.md): 110
+* [security@ccc.de](mailto:security@ccc.de)
+* [on site]({filename}../dect.md)
+
+## About us
+
+Heya 35C3!
+
+For the third year in a row, the CrewCrew, an all female bouncer-crew from the beautiful city of Hamburg is taking care of you on site.
+Just like you, we are trying to create a good and discrimination-free atmosphere, keeping our eyes and ears open.
+
+We work closely together with the CCC's awareness structures. Just like our colleagues, we stand up against sexist, racist, homo/transphobic, antisemitic behavior and any other kind of discrimination. We wish for all of us to interact and collaborate in solidariy.
+
+So in case you encounter or witness any conflicts or issues, please talk to us: We're very much looking forward to supporting you - that's why we're here, so please don't hesitate!
+
+Love, 
+
+your CrewCrew
+
+![CrewCrew Logo](/images/crewcrew.jpg)
\ No newline at end of file
diff --git a/content/pages/security/security.md b/content/pages/security/security.md
new file mode 100644
index 0000000..a9b50df
--- /dev/null
+++ b/content/pages/security/security.md
@@ -0,0 +1,32 @@
+Title: Security Team
+Longtitle: 35C3 Security Team
+URL: security/index.html
+save_as: security/index.html
+Slug: security
+Lang: de
+Template: page
+sortorder: 01
+Date: 2018-11-01
+
+Das Team "Security" hilft bei Konflikten und allen Belangen rund um eure Sicherheit – stets gemeinsam mit CERT und Awareness. Ist stets mit offenen Augen und Ohren für euch da.
+
+## Kontakt
+
+* [DECT]({filename}../dect.md): 110
+* [security@ccc.de](mailto:security@ccc.de)
+* [vor Ort]({filename}../dect.md)
+
+## Über uns
+
+Hallo 35C3! 
+
+Bereits im 3. Jahr in Folge ist die CrewCrew, eine Frauen*Bouncer-Crew aus Hamburg, für euch am Start. Unser Job: Wir versuchen, wie ihr auch, für alle eine gute (diskriminierungsarme) Atmosphäre zu schaffen und halten unsere Augen und Ohren offen.
+
+Wir arbeiten eng mit der Awareness-Struktur des CCC zusammen. Und ebensowie unsere Kolleg*innen stellen wir uns gegen sexistisches, rassistisches, homo-/transfeindliches, antisemitisches oder anderweitig diskriminierendes Verhalten und wünschen uns einen solidarischen Umgang miteinander. 
+
+Wenn ihr also Stress habt oder etwas mitbekommt, sprecht uns unbedingt und sehr gern an.
+Dafür sind wir da, don't hesitate to ask!
+
+Liebst, eure CrewCrew!
+
+![CrewCrew Logo](/images/crewcrew.jpg)
\ No newline at end of file
-- 
cgit v1.2.3