]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into v3.3.0 v3.3.0
authorMark Otto <markdotto@gmail.com>
Wed, 29 Oct 2014 18:56:48 +0000 (11:56 -0700)
committerMark Otto <markdotto@gmail.com>
Wed, 29 Oct 2014 18:56:48 +0000 (11:56 -0700)
commit16dbdbd7a2c6cfa3be4e5dcc52249e577c02c84a
tree6c395684bcb20f3442d7da641ba186f4ea2bd565
parentaa85e762eaff089c216f5bce79e7423989eec2f8
parent15d668dd1528a629e3989bddab85d6339433f6a0
Merge branch 'master' into v3.3.0

Conflicts:
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.min.css
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.min.css
test-infra/npm-shrinkwrap.json