]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Thu, 19 Dec 2013 00:19:46 +0000 (16:19 -0800)
committerMark Otto <otto@github.com>
Thu, 19 Dec 2013 00:19:46 +0000 (16:19 -0800)
commit07705673b6398ae9cfe2cb59b97d61e04efeb8bf
tree4f105edd66b0c13a8a99a636b4aef0bb640b883d
parentbc265ac64798c01b2f35ca48ef1a65025e0c71b5
parent3315d4d9f4c47e67f1d1c9f6a0b262a5d8b688bd
Merge branch 'master' into docs_derp

Conflicts:
_layouts/default.html
_includes/footer.html
getting-started.html