]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
authorMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 22:54:53 +0000 (14:54 -0800)
committerMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 22:54:53 +0000 (14:54 -0800)
commitadbbf17ee4a241b14503289e6726fc52acefc8a4
treeac7cc57aca1e989f6b72f0311660b7d2a458884a
parent16d12396d0f1f352280ae195ac60a15e7e95d666
parent532242e626c36beb3985e23f3f119373db21262a
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css