]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'pr/11493'
authorMark Otto <otto@github.com>
Sat, 30 Nov 2013 07:30:26 +0000 (23:30 -0800)
committerMark Otto <otto@github.com>
Sat, 30 Nov 2013 07:30:26 +0000 (23:30 -0800)
commit867422852130111e886df94ab0e5cd412ae2bafc
tree234e888088d7eeb44f99d6c5aaf0457a42f886a8
parente4848286c86af39c5a30c845748fdc46de8b8dd5
parent9f0da54856f6a4111b4d9f8780db2b2257ef90b1
Merge branch 'pr/11493'

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
less/button-groups.less