]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/10951
authorMark Otto <otto@github.com>
Sat, 14 Dec 2013 23:38:21 +0000 (15:38 -0800)
committerMark Otto <otto@github.com>
Sat, 14 Dec 2013 23:38:21 +0000 (15:38 -0800)
commita54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3
tree9b1c5697a731543a86711b016e1986ec1e81dad4
parent80e86442308b2cc86ba948de87e854057933e3ab
parentf1869771bc8b8e8a6c7a98385ec58e0bf0d2d98e
Merge branch 'master' into pr/10951

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