]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Wed, 15 May 2013 06:28:09 +0000 (23:28 -0700)
committerMark Otto <otto@github.com>
Wed, 15 May 2013 06:28:09 +0000 (23:28 -0700)
commit31dcb911893c1f7b6eebe097705a3e64568c8654
treed07fc6a206ef5e9377a6b80ad1d62a01112868bd
parentfcb7c9da6f5082e1306fab096c16020b4227c967
parent57856e6cfb21022035d8611607b15eb3a0cef76a
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
docs/assets/css/docs.css
docs/assets/css/docs.css
docs/components.html
docs/css.html