]> git.bitcoin.ninja Git - blog/commit
Merge branch 'master' into gh-pages
authorMark Otto <otto@github.com>
Sun, 22 Jun 2014 21:41:32 +0000 (14:41 -0700)
committerMark Otto <otto@github.com>
Sun, 22 Jun 2014 21:41:32 +0000 (14:41 -0700)
commitb6688e2ee3c710bc83b0078b163a3d70c0ffa0a9
tree4ffddf40f51669890ba09595672d730eff500bf6
parentc9fc6d2b802c4f9f601fce5b6a30d114e67b057d
parent8b3abef61f8c17ffca7f507f00984ded967ffb68
Merge branch 'master' into gh-pages

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