]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Mon, 6 Jan 2014 07:23:55 +0000 (23:23 -0800)
committerMark Otto <otto@github.com>
Mon, 6 Jan 2014 07:23:55 +0000 (23:23 -0800)
commit9421f0af82bd80ad13815d180d95459f67d5fec1
tree981d1b26d350b61c3668a3482f1284b1503a1648
parent3e54be9ae61aa95dae7aa5719f38d6dc0216c7b1
parent5b7f508c606cb5556b791f355c6a874db09baa4b
Merge branch 'master' into docs_derp

Conflicts:
docs/_layouts/default.html
docs/_layouts/home.html
docs/_includes/footer.html