]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/12490
authorMark Otto <otto@github.com>
Fri, 7 Mar 2014 05:32:52 +0000 (21:32 -0800)
committerMark Otto <otto@github.com>
Fri, 7 Mar 2014 05:32:52 +0000 (21:32 -0800)
commitc8614c0f15f0ce78426c6403e57aff22c3ce2beb
tree673d1a347374a8bf53a127c050dbc57762af3782
parentd1a7271ea1272e0f9775d49e6a84ee49819e0094
parentfab10b643eb1a2038fb31305f0b038b7a9a8554d
Merge branch 'master' into pr/12490

Conflicts:
less/list-group.less
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/_includes/customizer-variables.html
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-rtl.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/list-group.less
less/variables.less