]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Fri, 10 Jan 2014 04:33:55 +0000 (20:33 -0800)
committerMark Otto <otto@github.com>
Fri, 10 Jan 2014 04:33:55 +0000 (20:33 -0800)
commitea20f44815b535975d1f1416fee15bd1ea7acdb3
treeedb73c6ae943629dbdc51d3350a50a079f7a2f7e
parent04161a8c753c5f9ef83dd1f0848a17e8c4ab155c
parent7f153974e10980dccbdd485e63941b591e925148
Merge branch 'master' into docs_derp

Conflicts:
docs/assets/css/docs.css
docs/_includes/footer.html
docs/assets/css/docs.css
docs/assets/js/application.js
docs/components.html
docs/css.html
docs/getting-started.html