Commit graph

396 commits

Author SHA1 Message Date
Pepi Zawodsky 18d41a05ae
Merge pull request #94 from telegnom/master
@c3infodesk@chaos.social added
2019-10-01 21:17:57 +02:00
telegnom 9cc8a16b87 @c3infodesk@chaos.social added 2019-10-01 17:17:49 +02:00
Pepi Zawodsky f6d899a365
Merge pull request #93 from stefan2904/patch-2
no one likes darktard at camp
2019-09-07 19:21:52 +02:00
Stefan 010d14fb11
no one likes darktard at camp 2019-08-09 17:52:33 +02:00
Pepi Zawodsky ae20699b04
Merge pull request #90 from FreifunkerEZ/patch-1
Started Humans/Children
2019-08-01 19:39:04 +02:00
Pepi Zawodsky aa4a0b0e9b
Merge pull request #91 from FreifunkerEZ/patch-2
clean your coffee-machine before you leave
2019-08-01 19:38:23 +02:00
Pepi Zawodsky ffb0e3aeef
Merge pull request #92 from JackFy/master
Fixed r0ket.de Link
2019-08-01 19:38:00 +02:00
JackFy cac221a38b
Fixed r0ket.de Link 2019-07-30 14:20:11 +02:00
Chris f0782a77a1
Typo in humans/children 2019-07-26 13:06:28 +02:00
Chris 9fa4f00f22
clean your coffee-machine before you leave
or else: mold.
2019-07-26 12:05:14 +02:00
Chris 9db621aaa2
Started Humans/Children 2019-07-26 12:03:11 +02:00
Pepi Zawodsky 0fa79c2ff1
Merge pull request #89 from peterpoetzi/master
Update Hoverboard rule
2019-04-17 19:37:47 +02:00
Peter Pötzi f553468200
Update README.md 2019-04-17 15:23:48 +02:00
Pepi Zawodsky b6ec896cbd
Merge pull request #87 from genofire/patch-1
update decentral social networks
2019-01-04 19:24:04 +01:00
Pepi Zawodsky 6fb44779d2
Merge pull request #86 from TheMinefighter/master
Added batteries >=100Wh to the list of things forbidden on planes
2019-01-04 19:22:59 +01:00
Pepi Zawodsky c17f400b3b
Merge pull request #85 from alexrashed/travel-by-car
Infos about travelling by car
2019-01-04 19:21:57 +01:00
Pepi Zawodsky c90cc220ca
Merge pull request #84 from oliver/angel-lanyard
add angel lanyard
2019-01-04 19:19:55 +01:00
Pepi Zawodsky c86a0bb93c
Merge pull request #82 from jens1o/patch-1
Updated information for 35c3.
2019-01-02 22:13:41 +01:00
Geno 6f7abe6a24
update decentral social networks 2019-01-02 14:07:54 +01:00
Tobias Brohl aka The_Minefighter ae12a2678a
Update README.md 2018-12-28 21:44:02 +01:00
Alexander Rashed ab5227f93d
Add infos about travelling by car 2018-12-27 14:13:32 +01:00
Oliver Gerlich 292a720580 add angel lanyard
As pointed out at https://twitter.com/c3himmel/status/1076168476551720961
2018-12-25 20:59:30 +01:00
Jens Hausdorf 18ec11eff6
Rename emergency information to indicate it is up-to-date 2018-12-25 18:05:10 +01:00
Jens Hausdorf 9fb9032781
Updated information for 35c3. 2018-12-25 17:54:43 +01:00
Pepi Zawodsky 700c60339b
Merge pull request #80 from schumar/master
fix DARC link
2018-12-24 17:41:53 +01:00
Martin Schuster 6a5b0e6eed fix DARC link 2018-12-23 23:09:34 +01:00
MacLemon 5d3b5bbd90 Added a liberated Link for the USB-C cable Matrix. Fixes #78 2018-12-23 20:45:14 +01:00
Pepi Zawodsky 17e5f8dc90
Merge pull request #79 from alexrashed/dect-comp-list
DECT phone compatibility list v2
2018-12-23 18:28:56 +01:00
Alexander Rashed b6a387e656
DECT phone compatibility list v2 2018-12-19 16:08:37 +01:00
MacLemon 1d310b4cdf Updated Links for 35c3, Wiki, Fahrplan 2018-12-17 17:49:47 +01:00
Pepi Zawodsky 4c8f62eb1f
Merge pull request #77 from abraxa/master
Add comment to pre-approve CC purchases for Germany
2018-12-17 17:40:05 +01:00
Soeren Apel 9595f56add Add comment to pre-approve CC purchases for Germany 2018-12-16 23:20:43 +01:00
Pepi Zawodsky 1a18f8c4b2
Merge pull request #76 from adlerweb/patch-1
Important DECT-numbers, help.ccc.de, c3auti
2018-12-15 11:55:02 +01:00
Pepi Zawodsky 0eb91e184e
Merge pull request #75 from 1183519e/master
merge several policies into one reference to help.ccc.de
Awesome, thanks so much!
2018-12-15 11:53:43 +01:00
Pepi Zawodsky 52bb60646c
Merge pull request #74 from Unip0rn/patch-1
fix a typo, add towel to mobility
2018-12-15 11:52:48 +01:00
Florian Knodt 18ac752f24
Important DECT-numbers, help.ccc.de, c3auti 2018-12-12 18:34:48 +01:00
1183519e 833cf7ac99 merge several policies into one reference to hlep.ccc.de 2018-12-12 14:31:56 +01:00
The Webinterface 8f57dabae1
fix a typo, add towel to mobility
no serious car sharer will take you with them, when you can't show them your towel.
2018-12-12 01:17:02 +01:00
Pepi Zawodsky 8f836f3751
Fixed Links to Betäubungsmittelgesetz, closes #67 2018-11-27 22:10:31 +01:00
Pepi Zawodsky 78b592b4aa
Merge pull request #65 from AngelaPurple/master
Update README.md
2018-11-27 22:01:50 +01:00
Pepi Zawodsky ad19c734d8
Merge branch 'master' into master 2018-11-27 22:01:40 +01:00
Pepi Zawodsky c1828c3396
Merge pull request #66 from 1uk4sh/master
34c3 DVB-T2 instead of DVB-T
2018-11-27 22:00:42 +01:00
Pepi Zawodsky e972720b5a
Merge pull request #69 from MintoIntu/master
Added High Visibility Vests and Personal Mobility Devices
2018-11-27 22:00:21 +01:00
Pepi Zawodsky df2d598d97
Merge branch 'master' into master 2018-11-27 22:00:10 +01:00
Pepi Zawodsky 015aadd153
Merge pull request #70 from Columbia19/patch-1
added lab coat in the clothing section
2018-11-27 21:56:46 +01:00
Pepi Zawodsky 65b0516909
Merge pull request #71 from MHohenberg/master
Walking can become painful, prepare yourself
2018-11-27 21:56:24 +01:00
Pepi Zawodsky aa47a35526
Corrected the typo typo 2018-11-27 21:56:03 +01:00
Pepi Zawodsky 255529e502
Merge pull request #72 from TMSI23/add-business-cards
Add business cards
2018-11-27 21:50:19 +01:00
Pepi Zawodsky 8ac4d00f9a
Merge pull request #73 from schumar/master
add "running gear"
Run Schweinehund run!
2018-11-27 21:49:06 +01:00
Martin Schuster fbc8418f5f
add "running gear"
see https://mobile.twitter.com/3schweinehunde/status/1067308288625139714
2018-11-27 19:00:16 +01:00