]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11107
authorMark Otto <otto@github.com>
Sun, 15 Dec 2013 00:20:19 +0000 (16:20 -0800)
committerMark Otto <otto@github.com>
Sun, 15 Dec 2013 00:20:19 +0000 (16:20 -0800)
commit83c60ef3eec234b3dac94c841fd1f13f94aab36f
tree0d896dedbbd47723ab769b139b63a5a58778e578
parent3bfa630d2afe70452861b2466daab78daa47dda8
parent4afcebe0e71aafd0cfb501548a6591effdbe2e70
Merge branch 'master' into pr/11107

Conflicts:
docs-assets/js/raw-files.js
customize.html
docs-assets/js/raw-files.js
less/modals.less
less/variables.less