From fd5582dd953f4101800e5fecba355a8abfa610b3 Mon Sep 17 00:00:00 2001 From: Adam Thomas Date: Tue, 25 Dec 2012 18:48:12 +0000 Subject: [PATCH 1/3] Added hackerspace passport --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 51df7b4..ed1abf2 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ You'll also find list of all the nice humans who have contributed to this list a - Driver's license (even an international one) - Hotel booking - Ham radio license +- Hackerspace passport[5] @@ -242,8 +243,9 @@ These people have contributed to improve this list for everyone. In no particula [2]:https://www.eventphone.de/ [3]:https://events.ccc.de/congress/2012/wiki/29C3_Anti-Harassment_Policy [4]:http://r0cket.org/ +[5]:https://www.noisebridge.net/wiki/Passport [100]:https://twitter.com/Astarioth [101]:https://twitter.com/N4mes [102]:https://twitter.com/towo -[103]:https://twitter.com/michaelem \ No newline at end of file +[103]:https://twitter.com/michaelem From 894c3b834549bc262233e1d23ca89e6c145c68d4 Mon Sep 17 00:00:00 2001 From: Adam Thomas Date: Tue, 25 Dec 2012 18:49:33 +0000 Subject: [PATCH 2/3] Added plug adaptor --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ed1abf2..1783483 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,7 @@ Your personal medication does not belong on the public interwebs for your privac - Charger for Laptop - Mac: Small Duck-head and long (Schuko Plug) cord - Mac: MagSafe to MagSafe 2 Adapter +- Plug adaptor from your country of origin to Schuko[6] - 3* or 5* Extension (230V≈ @50Hz) with Schuko Plug (and optional switch) - Simple extension cord (230V @50Hz, Schuko Plug) - USB Sticks @@ -244,6 +245,7 @@ These people have contributed to improve this list for everyone. In no particula [3]:https://events.ccc.de/congress/2012/wiki/29C3_Anti-Harassment_Policy [4]:http://r0cket.org/ [5]:https://www.noisebridge.net/wiki/Passport +[6]:https://en.wikipedia.org/wiki/Schuko [100]:https://twitter.com/Astarioth [101]:https://twitter.com/N4mes From e68f697fa9fe717e57eec055205fc2d3d409ee9c Mon Sep 17 00:00:00 2001 From: Adam Thomas Date: Tue, 25 Dec 2012 18:55:04 +0000 Subject: [PATCH 3/3] Further notes on apologies. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1783483..7d35db8 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ You'll also find list of all the nice humans who have contributed to this list a ### Manners - Be excellent to each other -- If you spot somebody not being excellent to someone else, remind them to be excellent and have them apologi(s|z)e to the insulted part(y|ies). +- If you spot somebody not being excellent to someone else, remind them to be excellent and have them apologi(s|z)e to the insulted part(y|ies), but only if the insulted wish to be apologi(s|z)ed to. Sometimes the insulted party will just want to move on and not have any further contact with someone who was unexcellent to them. - If you don't want to be called $swearword, don't behave like one. - Help each other out - Read the [Anti Harrassment Policy][3] and live by it :-)