]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11162
authorMark Otto <otto@github.com>
Sun, 15 Dec 2013 00:29:47 +0000 (16:29 -0800)
committerMark Otto <otto@github.com>
Sun, 15 Dec 2013 00:29:47 +0000 (16:29 -0800)
commit323a40cc53dabf0561c588c8f8ccd690c5bb0a03
tree0f4ab3c35f65a6f88a8b4a8a28001650cdf4ae7a
parent89e0f1669f2b4166051affa4eec819475660ed72
parent83c60ef3eec234b3dac94c841fd1f13f94aab36f
Merge branch 'master' into pr/11162

Conflicts:
less/modals.less
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/modals.less
less/variables.less