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

Conflicts: _posts/2014-07-04-cryptoparty.markdown css/style.css
2014-10-26 23:48:43 +01:00
parent 1e0e4ee5b4 c7e717495f
commit a0afea6c7e
7 changed files with 64 additions and 1 deletions
--- a/css/style.css
+++ b/css/style.css
@ -99,4 +99,3 @@ ul.nav>li>a {
  display: block;
  margin:auto;
 }
-