]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
authorJacob Thornton <jacobthornton@gmail.com>
Fri, 2 Sep 2011 07:32:09 +0000 (00:32 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Fri, 2 Sep 2011 07:32:09 +0000 (00:32 -0700)
commitec82b613d3d19b47416924cde3e583da1e0d95c5
treedf2e7817715cbf70c5128e1774fe8d288c8a8e61
parent462287e25e0c2295884ad0d2cab31b0cd0b90b26
parent5ef4519ca8ddf035a19d8f6dfff8745fdb380e32
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip

Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
docs/index.html
lib/patterns.less