Commit graph

167 commits

Author SHA1 Message Date
Pepi Zawodsky
27e39f1abf Pull requests are welcome 2013-11-10 19:26:32 +01:00
Peter Schwindt
2ded7c2c2b Initial 30C3 changes
according to information found at
https://events.ccc.de/congress/2013/wiki/Static:Safety_and_Security
2013-10-08 19:13:38 +02:00
Pepi Zawodsky
46a2e51779 Added Ukulele and electronic tuner suggested by @nic_ko 2013-10-08 19:04:31 +02:00
Pepi Zawodsky
228afa6fe4 Added SSHuttle to tunneling solutions suggested by badboy 2013-10-08 19:04:30 +02:00
Pepi Zawodsky
f2a3a485c4 Added: knitting stuff and credits for anked 2013-10-08 19:04:30 +02:00
Pepi Zawodsky
204ecf9116 Typo corrected 2013-10-08 19:04:30 +02:00
Pepi Zawodsky
e4c208cb50 Added: Hint about power chords without needing an adapter. 2013-10-08 19:04:30 +02:00
Pepi Zawodsky
c19f1045d5 Corrected Typos spotted by Uliwitness 2013-10-08 19:04:30 +02:00
Pepi Zawodsky
8c1ad36c99 Added credits for kjellski 2013-10-08 19:04:30 +02:00
Kjellski
2d2f9548eb added direct conference schedule link 2013-10-08 19:04:30 +02:00
Kjellski
ef79a1c112 added train schedule informations 2013-10-08 19:04:30 +02:00
Kjellski
52b0da5d1f Added schedule section 2013-10-08 19:04:30 +02:00
Pepi Zawodsky
d0d3ed6f8d Merge pull request #6 from schwindp/master
Some last-minute additions
2012-12-25 23:05:21 -08:00
Pepi Zawodsky
3f958c25f7 Added: Remotes, corrected typos 2012-12-26 08:01:54 +01:00
Pepi Zawodsky
9c70b60aa8 Added: Swimming stuff 2012-12-26 07:58:09 +01:00
Peter Schwindt
e090501960 Some last-minute additions
Like typos and testing restore (!)
2012-12-26 07:51:34 +01:00
Pepi Zawodsky
95acf51887 Added: duct/gaffer tape 2012-12-26 02:04:52 +01:00
Pepi Zawodsky
5d9d965c34 Added: Cable ties 2012-12-26 02:03:19 +01:00
Pepi Zawodsky
89cd771c08 Added: More STD prevention tips, muscial instruments 2012-12-26 01:43:34 +01:00
Pepi Zawodsky
f9e17fee71 Added credit for fin 2012-12-26 01:38:30 +01:00
Pepi Zawodsky
c11c6ec643 Improved formatting 2012-12-26 01:37:56 +01:00
Pepi Zawodsky
7434d219bf Added: STD prevention tips 2012-12-26 01:21:52 +01:00
Pepi Zawodsky
00e6a57bf8 Merge pull request #5 from Monikae/patch-1
STD prevention
2012-12-25 16:18:51 -08:00
Pepi Zawodsky
0aad8c5a6f Amended Phone security section with tor for iOS. 2012-12-26 01:12:15 +01:00
Monikae
c4264f2076 Update README.md 2012-12-26 01:06:33 +01:00
Pepi Zawodsky
38e6ccf34f Fixed link. 2012-12-26 01:04:32 +01:00
Pepi Zawodsky
c831a076f2 Added: stuff for people wearing contact lenses or glasses, towels, phone security tips and more credits for contributions 2012-12-26 01:02:14 +01:00
Pepi Zawodsky
6f5082a3aa Merge pull request #3 from oe1rfc/master
DVB-T dongle and a phone security section added.
2012-12-25 15:56:51 -08:00
Pepi Zawodsky
835232c46f Merge pull request #4 from MarioVilas/master
Towel.
2012-12-25 15:54:58 -08:00
Pepi Zawodsky
7169f397e0 Merge pull request #2 from schwindp/master
Emergency contact fixes
2012-12-25 15:54:21 -08:00
Mario Vilas
0167141fb3 Update README.md
42
2012-12-26 00:11:06 +01:00
Pepi Zawodsky
881741815d Added: Gloves, scarf, lip(stick|balm|gloss) 2012-12-25 22:39:38 +01:00
Clemens Hopfer
755dec1a42 fixed link, now for real 2012-12-25 22:04:56 +01:00
Clemens Hopfer
f6d793a094 fixed link 2012-12-25 22:03:50 +01:00
Clemens Hopfer
b60750c8f5 Merge remote-tracking branch 'upstream/master' 2012-12-25 22:00:56 +01:00
Clemens Hopfer
6eb49bedda added DVB-T dongle 2012-12-25 21:58:06 +01:00
Clemens Hopfer
1b536b4d72 added phone security section 2012-12-25 21:57:05 +01:00
Pepi Zawodsky
b05ccda72b Added: plastic bag for laundry 2012-12-25 21:07:51 +01:00
Pepi Zawodsky
365ff304cd Added: SIM eject tool 2012-12-25 21:04:28 +01:00
Pepi Zawodsky
b8ca055779 Added: SIM cards 2012-12-25 21:03:56 +01:00
Pepi Zawodsky
a54d6fc769 Link corrected 2012-12-25 20:43:33 +01:00
Pepi Zawodsky
0a8acb87b3 Corrected a typo in a contributor's handle. I'm sorry 2012-12-25 20:42:57 +01:00
Pepi Zawodsky
05df2cdaa3 Corrected a typo. 2012-12-25 20:38:22 +01:00
Peter Schwindt
e7a602e90f Emergency contact fixes
added local 112 (CERT contact), removed duplicate Police Department
contact
2012-12-25 20:35:49 +01:00
Pepi Zawodsky
e4ada93373 Added micro USB cable hint to r0cket. 2012-12-25 20:09:32 +01:00
Pepi Zawodsky
b9ee8d54c7 Fixed my merge foobar. Added better linking to Schuko plugs. 2012-12-25 20:07:40 +01:00
Pepi Zawodsky
8f23f3c585 Added: HAM radio equipment 2012-12-25 20:04:06 +01:00
Pepi Zawodsky
7bcb1e55fe Merge pull request #1 from devdsp/master
Just checking off the pull request item :)
2012-12-25 11:02:46 -08:00
Adam Thomas
e68f697fa9 Further notes on apologies. 2012-12-25 18:55:04 +00:00
Pepi Zawodsky
28d451d5c5 Added: HAM radio equipment 2012-12-25 19:53:44 +01:00
Adam Thomas
894c3b8345 Added plug adaptor 2012-12-25 18:49:33 +00:00
Adam Thomas
fd5582dd95 Added hackerspace passport 2012-12-25 18:48:12 +00:00
Pepi Zawodsky
c161432deb Added: comfortable shoes 2012-12-25 19:35:58 +01:00
Pepi Zawodsky
4a16e02afe Added: Bepanthen, Lubricant 2012-12-25 19:33:29 +01:00
Pepi Zawodsky
7ebd1587b7 Added hint to refresh the list as it is WIP. 2012-12-25 19:31:12 +01:00
Pepi Zawodsky
bf4850d7a1 Added: portable battery packs 2012-12-25 19:26:30 +01:00
Pepi Zawodsky
ca5015bd80 Added tablet computers and kindle 2012-12-25 19:25:04 +01:00
Pepi Zawodsky
5c5ec88ff1 added Monitor adapters by @michaelem 2012-12-25 19:23:48 +01:00
Pepi Zawodsky
27be590fb3 Added: r0cket by @towo 2012-12-25 19:20:41 +01:00
Pepi Zawodsky
c7064f8908 Added @N4mes to credits 2012-12-25 19:14:38 +01:00
Pepi Zawodsky
bce9b38f2f Removed homeopathic stuff. Grab a dextrose bonbon instead. 2012-12-25 19:13:58 +01:00
Pepi Zawodsky
69f93ca730 Added credits for contributing parties 2012-12-25 19:12:41 +01:00
Pepi Zawodsky
038bd55c91 Improved formatting of emergency information 2012-12-25 18:55:01 +01:00
Pepi Zawodsky
44c9bd7bb9 Added Emergency contact information, please add more 2012-12-25 18:50:38 +01:00
Pepi Zawodsky
e242dfcb5a Added 29C3 Anti Harrassment Policy link 2012-12-25 18:46:30 +01:00
Pepi Zawodsky
f78fce6b92 Added a gazillion things to to, to pack, and more 2012-12-25 18:42:20 +01:00
Pepi Zawodsky
2c5c7ae404 initial checkin 2012-12-25 17:37:52 +01:00