]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'pr/11138'
authorMark Otto <otto@github.com>
Sat, 7 Dec 2013 22:10:41 +0000 (14:10 -0800)
committerMark Otto <otto@github.com>
Sat, 7 Dec 2013 22:10:41 +0000 (14:10 -0800)
commita9b86cbfde788b2ffc066353b4f77c45345c0e78
tree30e0a34533685043f92f9142e98374cc48428675
parenta1f737b43632f4615d54ec993dc645f858e3ca8d
parent07de53c644b315852c5f315ab91bfd6d65660d50
Merge branch 'pr/11138'

Conflicts:
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
components.html
dist/css/bootstrap.css
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
less/mixins.less