]> 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>
Wed, 18 Jan 2012 07:19:21 +0000 (23:19 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 18 Jan 2012 07:19:21 +0000 (23:19 -0800)
commit41a410b8e631ddcc958568402f1ea1616f2a982d
treef86607032e77ebaa161a0c0f7f64c1e0a8e1b643
parentf1a88eede391cbb4beaadce60768a351724d7633
parent7ec4e91324e6e490291f3de22e1127c4fa55f82a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
bootstrap.min.css
docs/javascript.html
lib/accordion.less
bootstrap.css
bootstrap.min.css
docs/base-css.html
docs/javascript.html
lib/accordion.less