Merge branch 'master' of github.com:chaospott/site

Conflicts:
	_posts/2014-07-04-cryptoparty.markdown
	css/style.css
This commit is contained in:
Timm Szigat committed 2014-10-27 00:10:47 +01:00
commit a0afea6c7e
7 files changed
+64 -1

No files matched your search

-1
View File
@@ -99,4 +99,3 @@ ul.nav>li>a {
display: block;
margin:auto;
}