]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c383c5 35073fc)
Merge pull request #15464 from twbs/address-15419
authorChris Rebert <github@rebertia.com>
Thu, 1 Jan 2015 00:11:04 +0000 (16:11 -0800)
committerChris Rebert <github@rebertia.com>
Thu, 1 Jan 2015 00:11:04 +0000 (16:11 -0800)
Address #15419

1  2 
Gruntfile.js patch | diff1 | diff2 | blob | history
dist/css/bootstrap.css patch | diff1 | diff2 | blob | history

diff --cc Gruntfile.js
Simple merge
diff --cc dist/css/bootstrap.css
Simple merge
Mirror of https://github.com/twbs/bootstrap.git