]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11536
authorMark Otto <otto@github.com>
Sun, 1 Dec 2013 07:35:56 +0000 (23:35 -0800)
committerMark Otto <otto@github.com>
Sun, 1 Dec 2013 07:35:56 +0000 (23:35 -0800)
commit53047fa587fc8ca5cc0cad751f71fca5470d453a
treea013806bef23a01e7ff0615f82b629703c553d6a
parentba4c5dae9b8e34e90e86ba28aa6bd5acf3351f0d
parent57070dcf4525fe82cab6a93300861867aa7f2d1e
Merge branch 'master' into pr/11536

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