Merge branch 'master' into patch-1

This commit is contained in:
Pepi Zawodsky 2016-12-16 14:56:04 +01:00 committed by GitHub
commit 063b5ccd67
2 changed files with 17 additions and 2 deletions

View file

@ -16,20 +16,23 @@ Many CCC Events record videos of the given lectures and some event offer live [s
- [CCC Live Streaming via C3VOC](https://streaming.media.ccc.de/)
- [C3 Subtitles Team](https://c3subtitles.de/) Crowdsources subtiles and translations
- [CongressEverywhere](https://events.ccc.de/congress/2016/wiki/Congress_Everywhere) Locations with public live-stream viewing
## Twitter
- @[c3bar] Bar Operation Center - Department of Tschunk Quality Assurance
- @[c3cert] Chaos Emergency Response Team
- @[c3hoc] Hair operations center
- @[c3infodesk] Infodesk/Travelservice for CCC related events
- @[c3kidspace] Childcare at Chaos events
- @[c3lightning_tlk] C3 Lighting talks organisation
- @[c3lingo] Translation and interpreter service - Volunteers welcome!
- @[c3noc] Network operation center
- @[c3poc] Phone operation center (DECT and GSM)
- @[c3roc_] C3 Radio Operation Center - Frequency coordination for events
- @[c3seidenstrasse] C3 pneumatic tube transport system
- @[c3sidechannel] C3 Field phone service
- @[c3troc] Train operation center
- @[c3voc] Video operation center (Recordings and live streaming)
- @[c3voc_releases] Bot that posts releases of fresh recordings in many formats
- @[ccc] Official Twitter Account of CCC events
- @[chaospatinnen] Mentoring Operation Center
- @[chaosupdates] CCC Updates
@ -42,16 +45,24 @@ Many CCC Events record videos of the given lectures and some event offer live [s
[RSS]:https://en.wikipedia.org/wiki/Rss "Wikipedia: RSS"
[Streaming]:https://streaming.media.ccc.de/ "C3VOC Streaming - LIVE!"
### Contact
[Email Contact](https://events.ccc.de/congress/2016/wiki/Static:Contact)
[c3bar]:https://twitter.com/c3bar "Bar Operation Center - Department of Tschunk Quality Assurance"
[c3cert]:https://twitter.com/c3cert "Chaos Emergency Response Team"
[c3hoc]:https://twitter.com/c3hoc "Hair operations center"
[c3infodesk]:https://twitter.com/c3infodesk "Infodesk/Travelservice for CCC related events"
[c3kidspace]:https://twitter.com/c3kidspace "C3 Kidspace"
[c3_lightningtlk]:https://twitter.com/c3_lightningtlk "C3 lightning talks organisation"
[c3lingo]:https://twitter.com/c3lingo "Translation and interpreter service"
[c3noc]:https://twitter.com/c3noc "C3 network operation center"
[c3roc_]:https://twitter.com/c3roc_ "Radio Operation Center - Frequency coordination for events"
[c3seidenstrasse]:https://twitter.com/c3seidenstrasse "C3 pneumatic tube transport system"
[c3sidechannel]:https://twitter.com/c3sidechannel "C3 field phone service"
[c3troc]:https://twitter.com/c3troc "C3 Train operation center"
[c3voc]:https://twitter.com/c3voc "C3 video operation center"
[c3voc_releases]:https://twitter.com/c3voc_releases "C3 video operation center - New releases Bot"
[ccc]:https://twitter.com/ccc "Official Twitter Account of CCC events"
[chaospatinnen]:https://twitter.com/chaospatinnen "Mentoring Operation Center"
[chaosupdates]:https://twitter.com/chaosupdates "CCC Updates"

View file

@ -230,6 +230,9 @@ In case something gets lost it can find its way back to you.
#### Power and Chargers
Start charging your batteries right now so they're ready when you finish packing and leave.
For travelling abroad there is a handy [World Electrical Plug & Socket Map][40]
- Charger for laptop
- Mac: small Duck-head and long ([Schuko Plug][6]) cord
- Mac: MagSafe to MagSafe 2 Adapter
@ -650,6 +653,7 @@ These people have contributed to improve this list for everyone (in no particula
[37]:https://de.wikipedia.org/wiki/Datenklo "CCC Datenklo - Akustik Koppler"
[38]:https://cert.ccc.de/ "C3 CERT"
[39]:https://events.ccc.de/congress/2016/wiki/Assembly:Coffeenerds "Coffeenerds at 33c3"
[40]:http://britishbusinessenergy.co.uk/plug-socket/ "World Electrical Plug & Socket Map"
[100]:https://twitter.com/Astarioth
[101]:https://twitter.com/N4mes