]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into sr-only-focusable
authorMark Otto <otto@github.com>
Sun, 9 Mar 2014 04:34:29 +0000 (20:34 -0800)
committerMark Otto <otto@github.com>
Sun, 9 Mar 2014 04:34:29 +0000 (20:34 -0800)
commitef5d8e98e2e9aa87496eef8359667f7e052ae636
tree0d202235247562f094df841960170b1245ea728b
parentdc5917bedfda321b72310209d2807ea10347f7ed
parente4d13e238d0d6ea241f4e77328f6551206d17362
Merge branch 'master' into sr-only-focusable

Conflicts:
dist/css/bootstrap.css
12 files changed:
dist/css/bootstrap-rtl.css
dist/css/bootstrap-rtl.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_layouts/default.html
docs/assets/js/raw-files.min.js
docs/css.html
docs/dist/css/bootstrap-rtl.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/getting-started.html