]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Tue, 31 Dec 2013 21:53:33 +0000 (13:53 -0800)
committerMark Otto <otto@github.com>
Tue, 31 Dec 2013 21:53:33 +0000 (13:53 -0800)
commitb253cb2c1e34a41940c4933fb95c46da833fc5f9
treee5a40b963eba273c42e4aad21fb3858a657002dd
parent9e1153d0498a9e9612c1db85922642fe2aa38c2a
parent8812856de1ce17bb2f482c75370fb2e3db7ac6de
Merge branch 'master' into docs_derp

Conflicts:
_config.yml
docs/_includes/footer.html
docs/_includes/nav-main.html
docs/_includes/old-bs-docs.html
docs/_layouts/default.html
docs/_layouts/home.html
docs/getting-started.html
docs/index.html
15 files changed:
_config.yml
docs/_includes/footer.html
docs/_includes/nav-about.html
docs/_includes/nav-css.html
docs/_includes/nav-getting-started.html
docs/_includes/nav-main.html
docs/_layouts/default.html
docs/_layouts/home.html
docs/about.html
docs/assets/css/docs.css
docs/assets/js/application.js
docs/components.html
docs/css.html
docs/getting-started.html
docs/index.html