]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Mon, 23 Jan 2012 23:06:56 +0000 (15:06 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Mon, 23 Jan 2012 23:06:56 +0000 (15:06 -0800)
commit74521e835489066d58813c960bc98d1713ea6074
tree487e40dd09ab1120130dc64b4292eb3e57f0eec2
parentf764aee4b919c28974dba7b91edac9a04172ba25
parenta074087034716804610637a5ad9cc0447a2cccb2
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
bootstrap.css
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html