]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11299
authorMark Otto <otto@github.com>
Sat, 30 Nov 2013 08:55:00 +0000 (00:55 -0800)
committerMark Otto <otto@github.com>
Sat, 30 Nov 2013 08:55:00 +0000 (00:55 -0800)
commit080aa7f5c8557b232005cb947df51968d4629656
treee546cc3ec229d201751e426da36a1b2a586ee428
parent441f9d67179f766377eed4b0cedc5dc6eec290e4
parent819e920d1646f7e9fec8d3dd6ba10dcbd2fa1599
Merge branch 'master' into pr/11299

Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
dist/css/bootstrap.css
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
less/jumbotron.less