]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Wed, 11 Sep 2013 19:31:21 +0000 (12:31 -0700)
committerMark Otto <otto@github.com>
Wed, 11 Sep 2013 19:31:21 +0000 (12:31 -0700)
commit37933a9e08e24e0683c3909aaabe79888e006ba6
treedcd0cbb40240b1e0a5b856ce8755fbcd9a6b9f10
parent5d1707a25c0ee68644a182196439a86be1beafbd
parentc62426daeb8e7709422ab2eeeb0cf2eb2fad4575
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/code.less