From: Mark Otto <markdotto@gmail.com>
Date: Sun, 19 Apr 2015 05:08:46 +0000 (-0700)
Subject: Merge branch 'master' into sass
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=68a55e96a41b80de4b350c67f4e6feed7a3079fe;p=blog

Merge branch 'master' into sass
---

68a55e96a41b80de4b350c67f4e6feed7a3079fe
diff --cc _config.yml
index 30929c2,276c57e..a2229f2
--- a/_config.yml
+++ b/_config.yml
@@@ -1,11 -1,5 +1,11 @@@
 +# Dependencies
- markdown:            redcarpet
++markdown:            kramdown
 +highlighter:         pygments
 +
  # Permalinks
 -permalink:        pretty
 +#
 +# Use of `relative_permalinks` ensures post links from the index work properly.
 +permalink:           pretty
  relative_permalinks: true
  
  # Setup