]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into popovers-use-radii-var
authorMark Otto <otto@github.com>
Fri, 7 Mar 2014 05:44:46 +0000 (21:44 -0800)
committerMark Otto <otto@github.com>
Fri, 7 Mar 2014 05:44:46 +0000 (21:44 -0800)
commitdf3eb66ede02646c3ddc15b796d189f5effc60bb
treea2705394355a4d1244e2dd9f7e8723e680477f6f
parent4868096dbdfbf9f82e08cf2906fd2ce19f8f1560
parent0c9308a3b29be6d56c582dce33092164be7997b4
Merge branch 'master' into popovers-use-radii-var

Conflicts:
dist/css/bootstrap.css.map
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
dist/css/bootstrap.css.map
docs/_includes/customizer-variables.html
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map