Mirrors/CongressChecklist
2
0
Fork 0
mirror of https://github.com/EventFahrplan/CongressChecklist synced 2024-11-25 16:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into patch-1

Browse source
This commit is contained in:
Pepi Zawodsky 2019-12-19 18:39:43 +01:00 committed by GitHub
commit 7170767fbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
35C3 Emergency Info.md → 36C3 Emergency Info.md
View file

@ -1,4 +1,4 @@
# Emergency Information for [35c3][0]:
# Emergency Information for [36c3][0]:
## English
@ -6,14 +6,14 @@ If you're in an emergency shout HELP!
If you need help, call for help, there are many, many friendly people around to help you.
* 35c3 Medical Emergency or in case of fire: Call local DECT 112 ([CERT](https://cert.ccc.de), medical professionals)
* 35c3 Security: Call local DECT 110
* 35c3 Awareness: Call local DECT 113
* 36c3 Medical Emergency or in case of fire: Call local DECT 112 ([CERT](https://cert.ccc.de), medical professionals)
* 36c3 Security: Call local DECT 110
* 36c3 Awareness: Call local DECT 113
* local law enforcement in Leipzig: 110 or +49 341 - 59350
* local sexual assault hotline for women in Leipzig: +49 341 - 4798179 [Frauennotruf](http://www.frauennotruf-leipzig.de/)
* Leipzig fire department: +49 341 1230 (BETTER USE 112 ON YOUR non-35c3 PHONE)
* Leipzig ambulance: +49 341 1230 (BETTER USE 112 ON YOUR non-35c3 PHONE)
* 35c3 organizers: [35c3-orga@cccv.de](mailto:35c3-orga@cccv.de)
* Leipzig fire department: +49 341 1230 (BETTER USE 112 ON YOUR non-36c3 PHONE)
* Leipzig ambulance: +49 341 1230 (BETTER USE 112 ON YOUR non-36c3 PHONE)
* 36c3 organizers: [36c3-orga@cccv.de](mailto:36c3-orga@cccv.de)
## Deutsch
@ -21,13 +21,13 @@ Wenn du dich in einer Notlage befindest schrei HILFE!
Wenn du Hilfe benötigst, frage nach Hilfe. Es sind viele, viele freundliche Menschen da, die dir sicherlich helfen werden.
* 35c3 medizinischer Notfall oder Feuer: Im lokalen DECT-Netz 112 ([CERT](https://cert.ccc.de), Menschen vom Fach)
* 35c3 Security: Im lokalen DECT-Netz 110
* 35c3 Awareness: Im lokalen DECT-Netz 113
* 36c3 medizinischer Notfall oder Feuer: Im lokalen DECT-Netz 112 ([CERT](https://cert.ccc.de), Menschen vom Fach)
* 36c3 Security: Im lokalen DECT-Netz 110
* 36c3 Awareness: Im lokalen DECT-Netz 113
* Polizei in Leipzig: 110 oder +49 341 - 59350
* Frauennotruf in Leipzig (bei sexuellen Übergriffen oder sexueller Gewalt): +49 341 - 4798179 [Frauennotruf](http://www.frauennotruf-leipzig.de/)
* Feuerwehr Leipzig: +49 341 1230 (BESSER: 112 im öffentlichen Telefonnetz)
* Rettungsdienst Leipzig: +49 341 1230 (BESSER: 112 im öffentlichen Telefonnetz)
* 35c3 Orga: [35c3-orga@cccv.de](mailto:35c3-orga@cccv.de)
* 36c3 Orga: [36c3-orga@cccv.de](mailto:36c3-orga@cccv.de)
[0]:http://events.ccc.de/category/35c3/ "35c3 Event Blog"
[0]: https://events.ccc.de/category/36c3/ "36c3 Event Blog"

12
README.md
View file

@ -695,8 +695,8 @@ These people have contributed to improve this list for everyone (in no particula
<!-- ## 🔗 Links -->
[1]:https://events.ccc.de/congress/2018/wiki/Static:How_To_Survive
[2]:https://guru3.eventphone.de/
[1]:https://events.ccc.de/congress/2019/wiki/Static:Information_Security
[2]:https://www.eventphone.de/
[3]:https://help.ccc.de/
[4]:http://r0ket.de/
[5]:https://www.noisebridge.net/wiki/Passport
@ -707,15 +707,15 @@ These people have contributed to improve this list for everyone (in no particula
[9]:https://github.com/sshuttle/sshuttle
[10]:https://www.blau.de/
[11]:https://en.wikipedia.org/wiki/Sim_card#Formats "SIM card formats"
[12]:https://events.ccc.de/congress/2018/wiki/
[13]:https://events.ccc.de/congress/2018/wiki/Static:Projects
[14]:https://events.ccc.de/congress/2018/wiki/Static:Assemblies
[12]:https://events.ccc.de/congress/2019/wiki/
[13]:https://events.ccc.de/congress/2019/wiki/Static:Projects
[14]:https://events.ccc.de/congress/2019/wiki/Static:Assemblies
[15]:https://bettercrypto.org/ "Better Crypto"
[16]:https://openvpn.net/ "OpenVPN"
[17]:http://code.kryo.se/iodine/ "iodine"
[18]:http://openssh.org/ "OpenSSH"
[19]:https://www.torproject.org/ "Tor Project"
[20]:https://events.ccc.de/congress/2018/Fahrplan/ "35C3 Fahrplan aka conference schedule"
[20]:https://fahrplan.events.ccc.de/congress/2019/Fahrplan/ "36C3 Fahrplan aka conference schedule"
[21]:https://www.organspende-info.de
[22]:https://play.google.com/store/apps/details?id=com.googlecode.droidwall.free
[24]:https://wifipineapple.com/ "WiFi Pineapple"