]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/15278
authorMark Otto <markdotto@gmail.com>
Sun, 18 Jan 2015 20:24:29 +0000 (12:24 -0800)
committerMark Otto <markdotto@gmail.com>
Sun, 18 Jan 2015 20:24:29 +0000 (12:24 -0800)
commit1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f
tree7a63ae1a434fae8cb51835fafd1b531d5f5da64e
parentdbe47654160d389c6991a312c9cecd2eeb9b6122
parent22b79dae3c9307c329e6722ff1be8aa0a4143812
Merge branch 'master' into pr/15278

Conflicts:
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.map
docs/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