]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into fix_15830 16175/head
authorMark Otto <markdotto@gmail.com>
Sun, 5 Apr 2015 06:52:40 +0000 (23:52 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 5 Apr 2015 06:52:40 +0000 (23:52 -0700)
commit510f56f334087b28581d4a8d02c92eebc693a92b
treec22fcb51754524582a968063acf12eecbe16489a
parenta2c69b814509653c454c7a91b9a7ad4521808223
parent9c41aee780bc1008019684955be7a029679245ca
Merge branch 'master' into fix_15830

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js