Commit Graph

7 Commits

Author SHA1 Message Date
Timm Szigat
f2fec9f9b4 logo shrinked 2014-10-27 19:27:54 +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
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
Timm Szigat
3c565f0574 Design and Jekyll added 2014-10-26 14:11:10 +01:00
Timm Szigat
39c5f87b66 2014-10-20 22:33:40 +02:00
Timm Szigat
14b52dc963 2014-10-20 22:33:40 +02:00