]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Sat, 28 Jan 2012 05:09:24 +0000 (21:09 -0800)
committerMark Otto <markdotto@gmail.com>
Sat, 28 Jan 2012 05:09:24 +0000 (21:09 -0800)
commitd0447e9aa54898ea46596e0e2077f33f0dbd1968
tree87f246db49b2130b5c7cc76ddde95f289f73cc00
parent3934d1b6c4cb975967235547b77e90b4c8c91be2
parent15d3a4797f3435d1531804369df87fa4e574b874
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

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