]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'pr/13320'
authorMark Otto <otto@github.com>
Thu, 1 May 2014 02:48:22 +0000 (19:48 -0700)
committerMark Otto <otto@github.com>
Thu, 1 May 2014 02:48:22 +0000 (19:48 -0700)
commit4c3ef52fc12519b59584a4696e6b3eca70551ce8
tree0341e4aeea9397b7a243e0424f40ea5655d05dca
parent17f77a5070fa090f351c882750c5cbb3a9c9e0d2
parent108b7c390efda6f9d56fb2749374a7999956b1a0
Merge branch 'pr/13320'

Conflicts:
dist/css/bootstrap-rtl.min.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap-rtl.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
dist/css/bootstrap-rtl.css
dist/css/bootstrap-rtl.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap-rtl.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css