Commit graph

132 commits

Author SHA1 Message Date
engeld
1d08d09f07 replaced 30c3 with 31c3 2014-11-24 15:45:12 +01:00
Pepi Zawodsky
7f39346678 Merge pull request #17 from Columbia19/master
Update README.md
2014-07-27 16:56:50 +02:00
Columbia19
cb5e625276 Update README.md
added tweezers to the cosmetics section
added section at the end "if you travel with your dog"
2014-07-27 14:57:07 +02:00
Pepi Zawodsky
b1d9b0b57f Added the term powerbank to portable battery packs. 2014-02-10 20:03:51 +01:00
Pepi Zawodsky
5efd82e2b8 Added RobFog to credits.x 2014-02-05 13:20:09 +01:00
Pepi Zawodsky
961f1ac847 Merge pull request #16 from RobFog/master
Proofreading and a lot of typo fixing thanks to RobFog.
2014-02-05 13:18:25 +01:00
Robbie
d0520b8df3 Update README.md
Fix a bunch of typos which irked me.
2014-01-18 01:36:23 +01:00
Pepi Zawodsky
75324a2dd1 Added german law regulations about pocket knifes as provided by n0la 2014-01-02 01:34:46 +01:00
Pepi Zawodsky
e25f6221dd Merge pull request #12 from KwadroNaut/master
sp
2013-12-26 01:12:19 -08:00
Pepi Zawodsky
a42973e782 Merge pull request #13 from PeterTheOne/patch-1
fix typo: the -> they
2013-12-26 01:10:06 -08:00
Pepi Zawodsky
08eb65e882 Merge pull request #14 from Cheatha/master
Added organ donor card, health insurance card, blanket
2013-12-26 01:09:32 -08:00
Cheatha
bb60599a4f Added blanket
Suggestion by FrauFledermaus
2013-12-25 12:27:57 +01:00
Cheatha
1bf319f167 Added health insurance card
Suggestion by FrauFledermaus
2013-12-25 12:27:27 +01:00
Cheatha
acf1b0270e Added organ donor card 2013-12-25 12:25:12 +01:00
Peter Grassberger
3022e8325b fix typo: the -> they 2013-12-25 01:34:24 +01:00
KwadroNaut
ae61329297 More spelling and clarification, dirty clothes bag
Dirty clothes bag shouldn't be from plastic: things get smelly in there without air. But plastic bags can be handy for your swimming gear on the last day, so either get both or make up your mind and think which one is good for you.
2013-12-24 23:55:23 +01:00
KwadroNaut
16618c9c83 sp 2013-12-24 23:42:21 +01:00
Pepi Zawodsky
f883c4fbc4 Merge pull request #11 from zakx/master
removed advice to use GSM for emergency numbers
2013-12-23 19:12:07 -08:00
zakx
194cae3a75 removed advice to use GSM for emergency numbers 2013-12-24 00:43:45 +01:00
Pepi Zawodsky
272e0bbb41 Added @ccc to list of contributing people. Thanks 2013-12-16 21:05:25 +01:00
Pepi Zawodsky
72cb105fa3 Updated Fahrplan link for 30C3 and removed inactive DECT numbers. Thanks @ccc for checking this. 2013-12-16 21:04:43 +01:00
Pepi Zawodsky
fd90f944ad Updated Link to Anti-Harrassment Policy Wiki Page 2013-12-16 20:22:11 +01:00
Pepi Zawodsky
76aa41d7df Fixed a comment. 2013-12-16 20:21:07 +01:00
Pepi Zawodsky
62aa32be04 Added links to most VPN suggestions 2013-12-16 19:50:29 +01:00
Pepi Zawodsky
d5f918569e Use TLS on your servers 2013-12-16 19:29:55 +01:00
Pepi Zawodsky
d5c1e5460c Added manual GSM network selection 2013-12-16 19:10:15 +01:00
Pepi Zawodsky
62c9f812fa Merge pull request #10 from stefan2904/patch-1
added think notebook, raspberry and wiki stuff
2013-12-16 09:48:52 -08:00
Pepi Zawodsky
990457b084 Share your VPN servers with those in need 2013-12-16 18:47:55 +01:00
Pepi Zawodsky
cf6b7035fd Added more examples for disk encryption 2013-12-16 18:44:29 +01:00
Pepi Zawodsky
2e5f85d029 Added more info on extension cords and multi-outlet strips 2013-12-16 18:41:27 +01:00
Pepi Zawodsky
6fea71f685 Updated How to survive link. 2013-12-16 18:23:58 +01:00
Stefan
ada67a70d3 fixed ellipsis 2013-12-12 10:31:59 +01:00
Stefan
8e353912f0 USB/Thunderbolt to Ethernet 2013-12-12 10:28:45 +01:00
Stefan
8ee9a57fe3 replaces rpi with all your devices 2013-12-12 10:26:44 +01:00
Stefan
6b6e37c048 congress wiki 2013-12-10 16:29:01 +01:00
Stefan
c0c804275d lowercased 2013-12-10 15:33:42 +01:00
Stefan
8c7d6e8b45 more network stuff 2013-12-10 15:28:30 +01:00
Stefan
80ae695501 added Raspberry 2013-12-10 15:11:33 +01:00
Pepi Zawodsky
2b8781e8d0 Merge pull request #9 from azet/master
add: water plants, rs232<->usb, camomile tea for stomach
2013-11-10 13:44:46 -08:00
Aaron Zauner
9badc3fc9b add: water plants, rs232<->usb, camomile tea for stomach, 2013-11-10 22:29:46 +01:00
Pepi Zawodsky
8c25eeb809 Corrected markdown link for blau.de 2013-11-10 20:28:43 +01:00
Pepi Zawodsky
075979a2e2 Slightly improved credits section and upgraded links to https where possible. 2013-11-10 20:15:04 +01:00
Pepi Zawodsky
96162f4407 Started section about PrePaid SIM cards 2013-11-10 20:08:25 +01:00
Pepi Zawodsky
29a1a89a80 Bring a real book 2013-11-10 20:03:57 +01:00
Pepi Zawodsky
bd6c54c4e1 Test your backups 2013-11-10 20:01:51 +01:00
Pepi Zawodsky
348d8e1b9d Added comments to links that need updating once they become available in a 30C3 flavour 2013-11-10 19:58:38 +01:00
Pepi Zawodsky
a653323502 Corrected even more typos. This is becoming embarrassing. 2013-11-10 19:54:54 +01:00
Pepi Zawodsky
7ba294074e Improved generic medication section with more product names for non-german speaking attendees. 2013-11-10 19:50:16 +01:00
Pepi Zawodsky
b702561791 Another typo corrected 2013-11-10 19:37:48 +01:00
Pepi Zawodsky
ec8a773fca Corrected a typo 2013-11-10 19:35:00 +01:00