]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11302
authorMark Otto <otto@github.com>
Sun, 15 Dec 2013 00:46:40 +0000 (16:46 -0800)
committerMark Otto <otto@github.com>
Sun, 15 Dec 2013 00:46:40 +0000 (16:46 -0800)
commit4c64c1eecdb52d943a50d2c181aeb915a3caed34
tree93b556ef583bb6a327cad76804bbdf4c5a4c6f4c
parent2b56ff04614c4617355d16c14784654e841bcf4d
parentd79431ca02683c9d1c754201260f66e5dda15614
Merge branch 'master' into pr/11302

Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css
docs-assets/css/docs.css
less/responsive-utilities.less