Commit graph

311 commits

Author SHA1 Message Date
Pepi Zawodsky ad84da7536
Merge pull request #60 from hettipeti/master
added Windows FDE option
2017-12-07 20:21:51 +01:00
Hetti f05b4bb22a added Windows FDE option 2017-12-07 20:12:13 +01:00
MacLemon b481a20d39 Bass, Bass, wir brauchen Bass 2017-12-07 19:46:40 +01:00
MacLemon ff50792cff Fixed two more Typos 2017-12-07 19:27:49 +01:00
MacLemon ed7446ac8c Fixed b0rked @FahrplanUpdate Link 2017-12-07 19:24:27 +01:00
MacLemon 5191ee8957 Added ALL the missing C3 Operation Centers on Twitter - so many there are 2017-12-07 19:22:28 +01:00
MacLemon 91a6802b28 Updated Email Link for 34c3 (Wiki 2017) 2017-12-07 18:32:15 +01:00
MacLemon 6553b3d954 Removed 33c3 Emergency Info, the good memories to that event remain. 2017-12-07 18:30:30 +01:00
MacLemon 6c26cd40dc Linkified Frauennotruf Info 2017-12-07 18:29:53 +01:00
Pepi Zawodsky 5faf005eda
Merge pull request #59 from optikfluffel/tweak
💕

😃🍻🍋
2017-12-07 18:24:30 +01:00
optikfluffel 08e90b4403 add basic TOC 2017-12-07 14:38:37 +01:00
optikfluffel 54c678af44 remove trailing spaces
and the extra newline at the end
2017-12-07 14:36:00 +01:00
optikfluffel d1a346d269 comment out links heading
because the content underneath it doesn’t get rendered on Github anyway
2017-12-07 14:33:38 +01:00
optikfluffel 3fceb43934 add Emojis to h2 headings 2017-12-07 14:32:49 +01:00
optikfluffel 410c12e993 remove underlined heading format
since there’s already a # in front of it
2017-12-07 14:31:43 +01:00
Pepi Zawodsky 6499b0bf90
Merge pull request #58 from telegnom/master
added 34c3 emergency info in english and german

Thanks! (Sorry for overlooking that pull request for way too long. My bad.)
2017-12-07 13:37:03 +01:00
telegnom 3054024744 added 34c3 emergency info in english and german 2017-11-06 23:16:53 +01:00
Pepi Zawodsky 3bae260521 Merge pull request #57 from telegnom/master
luggage restrictions
drugs listed in Appendix 3 of the Betäubungsmittelgesetz
coffee mugs (get your coffee @ coffeenerds as environment friendly as possible!)
SIM-Cards. NO more roaming fees inside the EU! \o/
2017-09-23 01:15:52 +02:00
telegnom 12a25d3360 Merge pull request #1 from telegnom/patch_by_gnom
updated some informations
2017-09-19 11:06:39 +02:00
telegnom a6d11c3323 updated some informations
- Luggage restriction on flights
- drugs under BtmG - Appendix 3 / Formular according to $75 of the Schengen Impementing Convention
- coffee mug to get your coffee @ coffeenerds
2017-09-19 11:05:03 +02:00
MacLemon 625779d72b Added hint and link to @Columbia19's \'s very handy Camping-Checklist 2017-06-30 18:32:21 +02:00
Pepi Zawodsky ccd4526d76 Merge pull request #56 from Astranox/master
update file reference
2017-06-30 18:26:50 +02:00
David Kaufmann 890614150f update file reference 2017-04-18 21:57:17 +02:00
MacLemon 443693a17d Added @c3DieLoung, official C3 Lounge Floor 2017-01-17 13:45:08 +01:00
MacLemon 2cbe049d4f Eeek, another typo 2016-12-26 13:22:40 +01:00
MacLemon e534c64e04 Must not forget some viable gear. 2016-12-26 11:42:26 +01:00
Pepi Zawodsky 21ed425e8a Merge pull request #55 from The-Compiler/patch-3
Add dental floss
2016-12-25 21:47:07 +01:00
Florian Bruhin 5dc893fe14 Add dental floss 2016-12-25 21:29:35 +01:00
MacLemon 841b2cdd6e Added C3Gelb, the Hygene team 2016-12-25 20:14:02 +01:00
Pepi Zawodsky aa9187128e Merge pull request #54 from JanX2/master
Fixed typo.
2016-12-25 18:47:33 +01:00
MacLemon 7224bf1aae Added @FahrplanUpdate 2016-12-25 18:28:17 +01:00
Jan Weiß 3de747f446 Fixed typos. 2016-12-25 18:25:51 +01:00
Jan Weiß e5b19eb130 Fixed typo. 2016-12-25 18:24:20 +01:00
Pepi Zawodsky e37cec0d90 Merge pull request #48 from jinxxproof/master
Update README.md
2016-12-25 18:03:40 +01:00
Pepi Zawodsky 53b694c89b Merge branch 'master' into master 2016-12-25 18:03:15 +01:00
Pepi Zawodsky 856f58ae10 Merge pull request #49 from PeterTheOne/patch-2
Fix link to @dot__not
2016-12-25 18:01:59 +01:00
Pepi Zawodsky 245924efff Merge branch 'master' into patch-2 2016-12-25 18:01:48 +01:00
Pepi Zawodsky 679f6bdadf Merge pull request #50 from joepie91/patch-1
Add 'silicone-based' as an option
2016-12-25 17:59:24 +01:00
Pepi Zawodsky fdd33fe068 Merge branch 'master' into patch-1 2016-12-25 17:59:12 +01:00
Pepi Zawodsky 2f6df0eccc Merge pull request #51 from jomo/patch-1
Stickers!
2016-12-25 17:57:13 +01:00
Pepi Zawodsky 2f7ca84032 Merge branch 'master' into patch-1 2016-12-25 17:56:59 +01:00
Pepi Zawodsky 2ff698c1f5 Merge pull request #52 from sandzwerg/patch-1
Added Awareness Team to Emergency Info
2016-12-25 17:54:35 +01:00
Pepi Zawodsky ad5b6bc246 Merge pull request #53 from JanX2/master
Added link for the power-saving feature
2016-12-25 17:53:34 +01:00
Jan b9f8cc08e3 Added link for the power-saving feature 2016-12-25 16:28:14 +01:00
sandzwerg 013730c0e1 Added Awareness Team to Emergency Info
For the 33c3 the Awareness Team is again available under DECT 113
2016-12-25 15:26:37 +01:00
MacLemon 1694e34655 Added Flip Flops for shared showers 2016-12-25 11:16:32 +01:00
jomo 67e6dbbfbc Stickers!
how was this not in here yet?
2016-12-23 16:43:18 +01:00
MacLemon e281247a65 Eeek, a typo. 2016-12-23 12:11:19 +01:00
MacLemon 2ca880e7ce Fixed small lighters section with current flight regulation info and accepted ID documents when travelling with Deusche Bahn. 2016-12-23 11:32:01 +01:00
Sven Slootweg 075cf2d611 Add 'silicone-based' as an option 2016-12-22 21:54:06 +01:00