]> 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>
Fri, 27 Jan 2012 19:07:17 +0000 (11:07 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Fri, 27 Jan 2012 19:07:17 +0000 (11:07 -0800)
commit3b3dbd7229f53eb71759def4eca90dfd7a2699f8
tree89a8af1724ef8791a315a028c5515a5ec8500d3b
parentaa594501bd24d51181dc3504602aa4aaefb1cb60
parent97546adc90a9c8149bb4560641b4164338e38063
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
docs/download.html
docs/scaffolding.html
js/bootstrap-typeahead.js