]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'pr/14801'
authorMark Otto <markdotto@gmail.com>
Sun, 26 Oct 2014 01:16:40 +0000 (18:16 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 26 Oct 2014 01:16:40 +0000 (18:16 -0700)
commit38217ee405de65a3fd3e2c217f8d5be8563da327
treeded110f315a4cb88764ac3a0de939039ccbaa01b
parenta0e6bd96de844725fb5a4f414aef721be86204c5
parent6e3c55a115ae0674c402a0c420c5b66a29ab072a
Merge branch 'pr/14801'

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