]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.2-wip' into exploratory
authorMark Otto <markotto@twitter.com>
Mon, 1 Oct 2012 18:27:40 +0000 (11:27 -0700)
committerMark Otto <markotto@twitter.com>
Mon, 1 Oct 2012 18:27:40 +0000 (11:27 -0700)
commite6d6c7a413d69afc41c3c57b72f1b0dedfdbb516
treecba5e4f18108c82b0d67298e671acd3c69b15fa7
parent8da78223ffe7922f46167e7429c40339e7bc53d2
parentc6c1ada60074e420fa93174cb3db167faf618e2b
Merge branch '2.1.2-wip' into exploratory

Conflicts:
docs/assets/css/bootstrap.css
less/navs.less
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/base-css.html
docs/scaffolding.html
docs/templates/pages/base-css.mustache
docs/templates/pages/scaffolding.mustache
less/reset.less