]> 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, 30 Nov 2011 06:35:58 +0000 (22:35 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 30 Nov 2011 06:35:58 +0000 (22:35 -0800)
commitcbb291b8ab316c3c0103da3c7b7a2c73596cfef2
treee632dc37d1f3dda4e91a06d4f671313a7e476187
parentb36df463108e2e4df8c389a06f577823564788d9
parent08d0aff19f8ad8fa2a9cfa389b8753c4525ea99c
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
bootstrap.min.css
bootstrap.css
bootstrap.min.css
docs/assets/css/docs.css
docs/base-css.html
lib/tables.less