]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' into derp
authorMark Otto <otto@github.com>
Sun, 13 Jul 2014 07:23:09 +0000 (00:23 -0700)
committerMark Otto <otto@github.com>
Sun, 13 Jul 2014 07:23:09 +0000 (00:23 -0700)
Conflicts:
docs/_includes/components/alerts.html
docs/javascript/dropdowns.md

1  2 
docs/javascript/dropdowns.md

Simple merge