]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/13736
authorMark Otto <otto@github.com>
Sun, 8 Jun 2014 20:57:44 +0000 (13:57 -0700)
committerMark Otto <otto@github.com>
Sun, 8 Jun 2014 20:57:44 +0000 (13:57 -0700)
commitd1872b4c98f26b1bfcd7e007133b97e6602dd0d0
treeccc12bda1d6df512fbc9c4023b296f46a6f05e3f
parent5872a7e0aca5e2b5b8e0be5df8b2a7cdf987d805
parent5cd72ce23058b47a739c7e2005ab5c3d4e28ff30
Merge branch 'master' into pr/13736

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
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/panels.less