]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into sr_friendly_hidden_content
authorMark Otto <otto@github.com>
Thu, 28 Aug 2014 05:38:46 +0000 (22:38 -0700)
committerMark Otto <otto@github.com>
Thu, 28 Aug 2014 05:38:46 +0000 (22:38 -0700)
commitf4eefd28d10198ea60ce4069c00236e74cda1bf5
tree9141bf9c907a2bf7962ca5abdb6f0c8496d8b1ad
parentdfa2759a52e73e720b0cda302a1edb9e2dbebc1f
parent1ebc7e62a8672c59c3bd886bc71ca90e9571d1bc
Merge branch 'master' into sr_friendly_hidden_content

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/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css