]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Wed, 1 Jan 2014 20:27:09 +0000 (12:27 -0800)
committerMark Otto <otto@github.com>
Wed, 1 Jan 2014 20:27:09 +0000 (12:27 -0800)
commit70459c1454d2d4d1df87e59c9dfa359c92b310bb
treeb6fe6447981e749eeb4721d027ae44f6dcc029ca
parentbab240252ad43f32b4efb04b2a2fde98044c2818
parentc583b7965550e60dd51cb11b50628420291463fe
Merge branch 'master' into docs_derp

Conflicts:
docs/_includes/footer.html
docs/assets/css/docs.css
docs/_includes/footer.html
docs/assets/css/docs.css