]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Thu, 12 Dec 2013 06:39:03 +0000 (22:39 -0800)
committerMark Otto <otto@github.com>
Thu, 12 Dec 2013 06:39:03 +0000 (22:39 -0800)
commit4fc2907723e7f7bb5b14eb5cec94d629b6834e7f
treea9c1df41fbf5f912234f762f03668ea4ef9fd2b7
parent0e8baab34ae21c813afb9d8c24b3cb2105aebc46
parent9966d035cd35c510369286cbb645340bdd6ffc95
Merge branch 'master' into docs_derp

Conflicts:
docs-assets/css/docs.css
docs-assets/js/application.js
_includes/footer.html
about.html
docs-assets/css/docs.css
docs-assets/js/application.js