Commit Graph

451 Commits

Author SHA1 Message Date
0092c39f28 ADD Post OWASP Stammtisch 2017-02-25 17:10:00 +01:00
c42d4b08e1 ADD Blogpost Ankündigung Cryptoparty 2017-02-13 17:13:12 +01:00
e70168c5fa ADD Blogpost Ankündigung Cryptoparty 2017-02-13 17:11:26 +01:00
27b56da1f0 ADD Ankündigung Code for Ruhr 2017-01-24 17:16:55 +01:00
fb8132d57e Fixed Date 2017-01-22 19:00:03 +01:00
3db872a1df ADD Ankündigung OWASP-Stammtisch 2017-01-22 18:54:16 +01:00
1738de51e7 Fix Blogpost Ankündigung Lesung 2016-11-27 01:19:53 +01:00
3e20cc7fbf Fix Blogpost Ankündigung Lesung 2016-11-27 01:16:40 +01:00
b4b7b4f866 Fix Blogpost Ankündigung Lesung 2016-11-27 01:14:34 +01:00
06bf5121b6 ADD Blogpost Ankündigung Lesung 2016-11-27 01:13:32 +01:00
e53d2136d9 ADD Blogpost Konkoria Cryptoparty 2016-11-26 10:41:52 +01:00
8763c43822 fixed typo 2016-11-25 16:47:25 +01:00
1b5edfbef7 fixed filetype 2016-11-25 16:45:08 +01:00
e6535cc87a ADD Blogpost Kindermedienfest 2016-11-25 16:43:46 +01:00
da771ac6f1 fexid typo 2016-11-22 10:02:04 +01:00
2a6e7ecd06 time?! 2016-11-22 09:59:23 +01:00
7932ff7f00 time?! 2016-11-22 09:58:30 +01:00
018e97c9ce ADD Blogpost OK Lab Ruhr 2016-11-22 09:57:16 +01:00
c806601336 ADD Post Cryptoparty 2016-11-02 18:52:05 +01:00
1e0d8de75e Uhrzeit eingefügt 2016-10-17 18:50:35 +02:00
bf8bc0e63b Fixed typo Ankündigung OWASP Stammtisch 2016-10-17 16:35:58 +02:00
3d00303bcb ADD Post Ankündigung OWASP Stammtisch 2016-10-17 16:34:57 +02:00
b4511cc415 content upgrade 2016-10-14 09:32:26 +02:00
4b5c77cc90 content upgrade 2016-10-14 09:29:55 +02:00
af6eabb586 fixed typo 2016-10-13 19:59:15 +02:00
10c3302cce fixed typos 2016-10-13 15:20:49 +02:00
a17536920e layout 2016-10-13 14:22:55 +02:00
a4f94e6a23 ADD Blogpost CMS Bundestreffen 2016-10-13 14:20:02 +02:00
29039335d3 fixed date for media folder 2016-10-03 11:24:24 +02:00
47e664d115 add picture mrmcd16 2016-10-03 11:21:44 +02:00
c6ac0d2102 changed logo to png 2016-09-13 10:53:13 +02:00
fb117debb5 fix background clolor 2016-09-13 10:43:31 +02:00
2690642d9e ADD Ankündigung Code for Ruhr 2016-09-13 10:36:52 +02:00
d0b67a25e5 Fixes 2016-09-08 21:18:52 +02:00
9919ea9526 fixed typo 2016-09-07 17:00:48 +02:00
5e22d1553a fixed typos 2016-08-28 19:02:51 +02:00
8f57a22d3d FIX Ankündigung Cryptoparty 2016-08-28 12:33:32 +02:00
13f4fb06f0 ADD Ankündigung Cryptoparty 2016-08-28 12:32:35 +02:00
187955304b Insert Links 2016-08-28 11:27:25 +02:00
77148a2e00 Fix Typo 2016-08-28 11:23:52 +02:00
47d4aa2deb Fiy Typo 2016-08-28 11:19:21 +02:00
d3441a20eb FIX Blog Post ICMP8 2016-08-25 15:43:47 +02:00
b12f4b89b3 FIX Blog Post ICMP8 2016-08-25 15:43:07 +02:00
685dc47c11 FIX Blog Post ICMP8 2016-08-25 15:41:55 +02:00
a1dd572752 ADD Blog Post ICMP8 2016-08-25 15:27:20 +02:00
8066f06afe Fixed typos 2016-07-06 16:20:49 +02:00
cdaa143b64 Fixed metadata 2016-07-06 16:17:53 +02:00
5c15386fba Add Post Das Gut Mensch 2016-07-06 16:16:35 +02:00
c6370aba7a FIX Blogpost CMS Dülken 2016-06-23 19:28:30 +02:00
969469115e FIX Blogpost CMS Dülken 2016-06-23 19:27:10 +02:00
a2689e5f30 FIX Blogpost CMS Dülken 2016-06-23 19:22:50 +02:00
f66bbad84c FIX Blogpost CMS Dülken 2016-06-23 19:21:46 +02:00
6f88369995 ADD Blogpost CMS Dülken 2016-06-23 19:20:33 +02:00
4b748048cd Fix typo 2016-06-12 13:55:31 +02:00
7cae85a297 bold email adress 2016-06-12 12:20:14 +02:00
d7a2401ae2 additional infos 2016-06-12 12:19:09 +02:00
41cfe6317a bold datum 2016-06-12 12:15:15 +02:00
ed8d071860 remove duplicate blogpost 2016-06-12 12:13:52 +02:00
6ba60567dc bold datum 2016-06-12 12:11:13 +02:00
57edb43076 ADD Blogpost Cryptoparty 2016-06-12 12:08:22 +02:00
a50571141d added facts from @neingeist 2016-06-01 23:41:12 +02:00
1e92663160 Fix Typos 2016-05-31 22:52:12 +02:00
3664487bc6 Fix Blog Post GPN 16 2016-05-31 22:32:10 +02:00
8633d4a0a5 Fix Blog Post GPN 16 2016-05-31 22:29:01 +02:00
ef6c6b9b62 Fix Blog Post GPN 16 2016-05-31 22:26:13 +02:00
4f3e4c5cfc Fix Blog Post GPN 16 2016-05-31 22:24:46 +02:00
88f14ab707 ADD Blog Post GPN 16 2016-05-31 22:21:49 +02:00
9f05307f92 TypoFix Blogpost Konkordiaschule 2016-05-12 18:05:16 +02:00
71d35e1c2a DatumFix Blogpost Konkordiaschule 2016-05-12 18:02:42 +02:00
53e1a64125 ADD Blogpost Konkordiaschule 2016-05-12 18:00:48 +02:00
Matthias Lindhorst
f41378a1f8 Fixed typo. 2016-05-08 22:15:02 +02:00
a90931d374 FIX Blogpost GoA16 2016-05-08 18:38:05 +02:00
d5a1729253 FIX Blogpost GoA16 2016-05-08 18:30:18 +02:00
65df19cc69 FIX Blogpost GoA16 2016-05-08 18:22:52 +02:00
3ba30bcccd ADD Blogpost GoA16 2016-05-08 18:22:11 +02:00
09108e08f7 Link auf Petitfoo 2016-05-05 12:00:42 +02:00
4ccf06385b Datumsangabe 2016-05-05 11:54:51 +02:00
e1c01b094d Typo 2016-05-05 10:24:43 +02:00
00c6ced701 ADD Blogpost Ankündigung Wirklichkeit und Verschwörungstheorien 2016-05-05 10:04:13 +02:00
Matthias Lindhorst
b9428a1465 Fixed broken link. Added link to heldenbar. 2016-04-29 21:53:14 +02:00
Matthias Lindhorst
a18bbd113d Added blog post about the play 'Mein Leben mit Big Data'. 2016-04-28 01:02:57 +02:00
9f64f93cae Post erweitert 2016-04-15 18:51:11 +02:00
113c01b1b8 removed newline 2016-04-11 21:38:59 +02:00
d78bcf3d7b Fix Typo and imagelink 2016-04-11 21:32:55 +02:00
7c7985ef67 ADD POST brmlab 2016-04-11 21:30:27 +02:00
m
a20e77aae5 Update 2016-02-29-glad0s.markdown 2016-04-06 10:09:34 +02:00
m
2dbe782462 Link auf instructables.com im GlaD0S-Artikel nachgetragen. 2016-04-06 10:07:25 +02:00
m
ea378fd21d fixed typos 2016-03-07 06:56:07 +01:00
bc28b3e5e3 Größenangabe 2016-03-06 21:10:49 +01:00
5134813902 link added 2016-03-06 21:08:39 +01:00
4b24a629b8 link added 2016-03-06 21:01:23 +01:00
c4a67b17f7 ADD POST fnordeingang 2016-03-06 20:59:16 +01:00
b4504deb6e Fix Blogpost Glad0 2016-02-29 10:45:53 +01:00
c08fa5aa28 Fix Blogpost Glad0 2016-02-29 10:44:32 +01:00
1c88976c85 Fix Blogpost Glad0s 2016-02-29 10:38:47 +01:00
52667e432c Add Blogpost Glad0s 2016-02-29 10:37:28 +01:00
25f195ee74 FIX Typo Post Maschinendeck 2016-02-25 17:48:12 +01:00
38e7fb17f4 ADD Post Maschinendeck 2016-02-25 17:45:28 +01:00
7da25404b9 Ankündigung zur Cryptoparty 2016-02-14 19:54:03 +01:00
262d7e0fcf Ankündigung zur Cryptoparty 2016-02-14 19:52:12 +01:00
f9dc04f839 Ankündigung zur Cryptoparty 2016-02-14 19:49:19 +01:00
26cbf39f61 Fiy Typo 2016-01-30 13:38:27 +01:00
4c82bd8901 Beitrag erweitert 2016-01-28 12:00:18 +01:00
3a13b2f641 Beitrag erweitert 2016-01-28 11:50:45 +01:00
Van Fanel
d909f0acff Adds Github source link to call me article 2016-01-28 10:19:45 +01:00
31fd2e07a0 beitrag erweitert 2016-01-26 19:21:37 +01:00
206dbbd6ad fixed Typos 2016-01-26 17:49:53 +01:00
ce01ac19f9 Escaped > characters 2016-01-26 17:40:39 +01:00
Van Fanel
ee0a787c7d Fixes Link in Leog Roboter post 2016-01-24 19:37:09 +01:00
Van Fanel
9c12603cc5 Fixes Date in Metadata for lego post 2016-01-24 19:35:09 +01:00
Van Fanel
a79946837c Fixes missing metadata from lego roboter post 2016-01-24 19:32:16 +01:00
Van Fanel
0e622e13e2 Vans Lego Roboter 2016-01-24 19:28:05 +01:00
gammlaa
46927bc59d ADD Post 32C3 2016-01-22 19:46:04 +01:00
Timm Szigat
56719332a9 fixxed ssl issues 2016-01-02 21:58:18 +01:00
Timm Szigat
e0b16d1d40 fixxed typo 2016-01-02 20:10:34 +01:00
Timm Szigat
8d41e75f7d added cryptoparty date in january 2016-01-02 19:45:31 +01:00
gammlaa
383e11f367 FIX Blogpost CCCamp15 listitems 2015-11-01 11:20:07 +01:00
gammlaa
af6dadfbee FIX Blogpost CCCamp15 listitems 2015-11-01 11:19:10 +01:00
gammlaa
914cada9cd FIX Blogpost CCCamp15 2015-11-01 11:18:18 +01:00
gammlaa
a055d020ae ADD Blogpost CCCamp15 2015-11-01 11:17:03 +01:00
gammlaa
1bb618e315 ADD Blogpost ABBUCtreffen 2015-10-26 14:04:21 +01:00
gammlaa
00e309f91e ADD Blogpost ABBUCtreffen 2015-10-26 14:03:42 +01:00
gammlaa
090df14b9a ADD Blogpost MTKJ Sep15 2015-10-09 13:03:07 +02:00
gammlaa
3f8f8c58f6 Fix Typo 2015-10-05 16:07:06 +02:00
m
d465ce929d Fixed a c&p fail. 2015-09-23 12:44:45 +02:00
gammlaa
8960af341e Update Post MRMCDs 2015-09-17 23:42:02 +02:00
gammlaa
39e261b445 Update Post MRMCDs 2015-09-17 23:37:48 +02:00
gammlaa
43ca52fae9 Update Post MRMCDs 2015-09-17 23:27:50 +02:00
gammlaa
80dc48acd6 Update Post MRMCDs 2015-09-17 23:26:09 +02:00
gammlaa
a926aa17ce Bild von der GPN eingefügt 2015-09-17 11:25:30 +02:00
gammlaa
e8a8e88d59 ADD Post MRMCD15 2015-09-16 19:03:52 +02:00
gammlaa
a4329b00f3 ADD Post MRMCD15 2015-09-16 18:57:17 +02:00
m
b0d96d6cbc FIX Post 5ter Geburtstag
Das grammatikalische Geschlecht des Wortes "Mitglied" ist Neutrum. In Betracht dessen wirkt "Mitgliederinnen und Mitglieder" seltsam.
2015-09-16 12:55:45 +02:00
gammlaa
3921e70f3b FIX Post 5ter Geburtstag Typo 2015-09-16 11:45:11 +02:00
gammlaa
d69eb23fd9 ADD Post 5ter Geburtstag 2015-09-16 11:34:07 +02:00
gammlaa
6e3f873a99 FIX Post Goa Typos 2015-09-16 11:27:45 +02:00
gammlaa
18e351a232 FIX Post Goa Typos 2015-09-16 11:26:35 +02:00
gammlaa
e8f04aa99e FIX Post Goa Typos 2015-09-16 11:24:00 +02:00
sirgoofy
d308f7a8cb Eintrag zum GoA 2015-09-07 16:17:15 +02:00
gammlaa
bb58bdf0ca FIX Post was bisher geschah 2015-09-06 20:05:26 +02:00
gammlaa
907b2dd485 FIX Post Was bisher geschah 2015-09-05 15:58:32 +02:00
gammlaa
38662f2fba FIX Post Was bisher geschah 2015-09-05 15:55:10 +02:00
gammlaa
3dcd56fc12 FIX Post Was bisher geschah 2015-09-05 15:54:06 +02:00
gammlaa
7eca73bf03 FIX Post Was bisher geschah 2015-09-05 15:52:33 +02:00
gammlaa
6474be5bca ADD Post Was bisher geschah 2015-09-05 15:51:11 +02:00
gammlaa
73492a7daa FIX Post GPN15 2015-09-05 14:04:27 +02:00
gammlaa
0845de9765 ADD Post GPN15 2015-09-05 14:01:56 +02:00
gammlaa
ab06dea48b Fix Typo 2015-08-28 10:06:09 +02:00
gammlaa
2c7da072e5 Merge branch 'master' of github.com-gammlaa:c3e/site 2015-08-24 19:48:46 +02:00
gammlaa
1e9e2b4a02 ADD Blogpost Cryptopaty 8.9 2015-08-24 19:48:15 +02:00
m
feb9540ce4 Update 2015-08-21-10dinge.markdown 2015-08-24 08:36:08 +02:00
gammlaa
8368f8d512 Typo Blogpost 2015-08-22 11:22:38 +02:00
gammlaa
f08b1e8fc2 Blogpost: 11 Dinge 2015-08-21 13:56:42 +02:00
gammlaa
d902d1731a ADD POST Cryptoparty 14. Juli 2015-07-02 10:47:37 +02:00
gammlaa
2d52def2cc ADD Post CMS im Pott und Umgebung 2015-06-28 16:51:15 +02:00
sirgoofy
a7603351e2 CC-Hinweis eingefügt 2015-06-23 09:12:40 +02:00
sirgoofy
4ea8f8a82d Eintrag zum Camp 2015-06-22 10:54:57 +02:00
sirgoofy
ff0bac67c8 Blogeintrag zum Freifunktag. 2015-06-21 22:48:01 +02:00
sirgoofy
ba42bf7d01 Artikel Tür und Freifunk 2015-04-30 18:13:39 +02:00
sirgoofy
db19b669f6 Artikel Tür und Freifunk 2015-04-30 18:11:31 +02:00
gammlaa
637e2c4d56 ADD Post Ankündigung VHS 2015-04-28 11:59:13 +02:00
gammlaa
c7a4bfc35e UPDATE Blogpost Cryptoparty 2015-04-21 15:46:04 +02:00
gammlaa
38f1d28e6a UPDATE Blogpost Cryptoparty 2015-04-21 15:44:47 +02:00
gammlaa
97f1479e9e Zusätzliche Infos 2015-04-10 14:43:45 +02:00
gammlaa
107c027b75 Zusätzliche Infos 2015-04-10 14:37:43 +02:00
gammlaa
541846b079 FIX Typo 2015-04-08 22:15:13 +02:00
gammlaa
3f70af1040 FIX Post EH15 2015-04-08 17:24:53 +02:00
gammlaa
de155d1bb4 FIX Post EH15 2015-04-08 17:13:04 +02:00
gammlaa
1020ef1d49 ADD Post EH15 2015-04-08 17:08:00 +02:00
gammlaa
e8be36f78f FIX Typo 2015-04-02 20:15:00 +02:00
gammlaa
9189c0daf7 ADD Post Fnordtreff 2015-04-02 16:51:47 +02:00
gammlaa
1272ae9733 FIX POST CMS in Rhyedt 2015-03-22 14:40:42 +01:00
gammlaa
5887ed17f4 FIX POST CMS in Rhyedt 2015-03-22 14:37:09 +01:00
gammlaa
b6d6ce51a2 ADD POST CMS in Rhyedt 2015-03-22 14:35:43 +01:00
gammlaa
20a123de9a UPDATE Post Cryptoparty 2015-03-03 16:07:03 +01:00
gammlaa
3025425329 FIX Post Tag der offenen Tür 2015-02-20 19:15:05 +01:00
gammlaa
c05ee1da2e ADD Post Tag der offenen Tür 2015-02-20 19:10:05 +01:00
gammlaa
5ecbd1a76d Bild eingefügt 2015-02-12 11:54:42 +01:00
melf1
027187961e Fix broken links and remove a few trailing spaces. 2015-01-23 16:42:03 +01:00
Christian
d34e154fc6 FIX Post Weihnachtsfeier 2015-01-12 12:08:06 +01:00
Christian
e49cf2a065 FIX Post Weinachtsfeier 2015-01-11 19:38:15 +01:00
Timm
6fc7b69635 Update 2015-01-06-weinachtsfeier.markdown 2015-01-10 19:12:59 +01:00
Christian
35d45b3ecb Adresse bearbeitet 2015-01-10 18:35:25 +01:00
Christian
fb58d88d4b FIX Post Cryptoparty 2015-01-07 18:37:41 +01:00
Christian
5b2ab34666 ADD Post Cryptoparty 2015-01-07 18:34:41 +01:00
Christian
facade87ce Fix Typo 2014-12-03 12:27:57 +01:00
Christian
56b70ddb16 FIX Typo 2014-12-01 23:23:30 +01:00
Christian
f1e35043c4 Dateinamen auf Kleinschreibung geändert 2014-12-01 23:22:26 +01:00
Christian
9a44ec45c4 ADD Post here be dragons again 2014-12-01 23:20:01 +01:00
Christian
2cc3ba4751 ADD Post Neuer termin 2014-12-01 23:15:00 +01:00
Christian
a013c725dc ADD Post Koordinierungstreffen 2014-12-01 23:11:30 +01:00
Christian
398229a948 ADD Post Chaostreff 20.10.09 2014-12-01 23:05:59 +01:00
Christian
d7351f50ab ADD Post Chaostreff 6.10.09 2014-12-01 23:01:41 +01:00
Christian
af187688db Bild eingefügt 2014-12-01 13:34:04 +01:00
Christian
54188d7f42 FIX Post BastelWE 2014-12-01 11:31:27 +01:00
Christian
85585d8986 Post BastelWE fortgeführt 2014-12-01 11:18:55 +01:00
Christian
f00ff88ab3 FIX Post ICMP 2014-11-29 21:21:50 +01:00
Christian
697aa16fb3 FIX Post ICMP 2014-11-29 19:32:59 +01:00
Christian
86e9e4ce5a FIX Post ICMP7 2014-11-29 17:04:11 +01:00
Christian
bd33203561 FIX Post ICMP7 2014-11-29 17:02:29 +01:00
Christian
91a44d7b81 ADD Post ICMP7 2014-11-29 16:59:15 +01:00
Christian
fdcfead5e5 ADD Post CRE 2014-11-29 15:43:11 +01:00
Juergen Stuber
9f7233f954 Adds post "Bastelwochenende". 2014-11-28 23:12:34 +01:00
Christian
bdd68d0f8d FIX Post Cryptoparty 2014-11-18 08:13:11 +01:00
Christian
c9cfea2650 FIX Post Hackend 2014-11-17 22:04:46 +01:00
Timm
7030ec27f9 Update 2014-11-17-hackend.markdown 2014-11-17 11:53:12 +01:00
Christian
843e8ceebd FIX Post hackend 2014-11-17 11:38:06 +01:00
Christian
ab0b26b3f4 FIX Post Hackend 2014-11-17 10:59:03 +01:00
Christian
e8befee218 FIX Post Hackend 2014-11-17 10:54:30 +01:00
Christian
121d2d4f95 FIX Post Hackend 2014-11-17 10:45:09 +01:00
Christian
5cccd6ad3e FIX Post Hackend 2014-11-17 00:56:41 +01:00
Christian
d2bdc57418 FIX Post Hackend 2014-11-17 00:53:55 +01:00
Christian
54bab72b6e ADD Post Hackend 2014-11-17 00:52:02 +01:00
Christian
62ea08a789 FIX Post CryptoParty 2014-11-05 23:55:57 +01:00
Christian
d69d7f7c77 FIX Post CryptoParty 2014-11-05 23:53:05 +01:00
Christian
df192aedbf ADD Post CryptoParty 2014-11-05 23:47:13 +01:00
Timm Szigat
5f0b5a8776 fixed blogpage 2014-11-04 01:58:48 +01:00
Christian
667bc5866c Fixes 2014-11-02 21:20:40 +01:00
Christian
6ec4325081 ADD Post MRMCD + Link check 2014-11-01 17:41:43 +01:00
Christian
b03adcd946 ADD Posts 2014-10-31 16:09:10 +01:00
Christian
f2d4bf3b13 FIX Post 2014-10-31 14:13:48 +01:00
Christian
a5897732ad FIX Post 2014-10-31 14:07:38 +01:00
Christian
1222828070 FIX Post Sommerfest 2014-10-31 14:03:42 +01:00
Christian
e199dde524 ADD Post CMS Viersen 2014-10-31 13:58:25 +01:00
Christian
800701f496 FIX Post Besuch CCCAC 2014-10-31 13:52:06 +01:00
Christian
c6be26ad77 ADD Post Besuch CCCAC 2014-10-31 13:47:35 +01:00
Christian
4b6d934b27 ADD Post Hackend 2014-10-31 13:40:45 +01:00
Christian
8b5693c4ed ADD Post Besuch CCCMz 2014-10-31 13:34:35 +01:00
Christian
dfe24044d5 ADD Post EH13 2014-10-31 13:29:47 +01:00
Christian
7fb831cdca ADD Post Docpath 2014-10-31 10:21:03 +01:00
Christian
8fb5bfe9aa ADD Post OHM 2014-10-30 21:45:13 +01:00
Christian
a97a3cc1d3 ADD Post GPN 13 2014-10-30 21:36:07 +01:00
Christian
23ccaa9d9e ADD Post Datenspuren 13 2014-10-30 21:24:09 +01:00
Christian
5708179e1f ADD Post CmS Bundestreffen 13 2014-10-30 21:17:05 +01:00
Christian
b44476d282 ADD Post 30C3 2014-10-30 21:08:57 +01:00
Christian
8680e4fd0d ADD Post Hackover 2013 2014-10-30 20:55:13 +01:00
Christian
f163a7fdaa ADD Post Freifunktag im NL 2014-10-30 20:44:33 +01:00
Christian
1756676dab ADD Post ORR 14 2014-10-30 20:40:15 +01:00
Christian
7a3d567553 ADD Post CMS Viersen 2014-10-30 20:04:11 +01:00
Christian
5a977e399c ADD Post CMS Viersen 2014-10-30 19:55:47 +01:00
Christian
a188cb586d ADD Post CMS Bonn 2014-10-30 19:50:56 +01:00
Christian
3709b8cb7d ADD Post CMS RWB 2014-10-30 19:35:48 +01:00
Timm Szigat
757c93c7d8 fixxed navigation, repaired picture links 2014-10-29 00:17:20 +01:00
Timm
60b44514f5 Update 2010-09-05-mrmcd1001b.markdown 2014-10-28 10:28:27 +01:00
Timm
7693831289 repaired image path 2014-10-28 10:27:56 +01:00
Timm Szigat
f241e1a585 removed doublet articles 2014-10-27 00:29:22 +01:00
Timm Szigat
a0afea6c7e Merge branch 'master' of github.com:chaospott/site
Conflicts:
	_posts/2014-07-04-cryptoparty.markdown
	css/style.css
2014-10-27 00:10:47 +01:00
Timm Szigat
1e0e4ee5b4 resized pictures 2014-10-26 23:43:30 +01:00
Timm Szigat
af8e095bf4 added a few articles, added media 2014-10-26 19:35:05 +01:00
Timm Szigat
b4415b675e Design and Jekyll added 2014-10-26 14:11:10 +01:00