]> git.bitcoin.ninja Git - blog/commit
Merge branch 'master' into gh-pages
authorMark Otto <markdotto@gmail.com>
Thu, 25 Sep 2014 17:45:46 +0000 (10:45 -0700)
committerMark Otto <markdotto@gmail.com>
Thu, 25 Sep 2014 17:45:46 +0000 (10:45 -0700)
commite8b6a60776dc36adb61862df754508353640a816
tree03c195eb64c9766e8e20d81ea3476acb30494d9f
parent85ce3b49e732fb7d381714596a474ce20ce97aa8
parent7328f77e06c72050650ddc61f0df55c9bd2aa903
Merge branch 'master' into gh-pages

Conflicts:
_includes/head.html
_includes/head.html