]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fa3712 8ff4717)
Merge pull request #20876 from bardiharborow/fix-travis
authorMark Otto <markd.otto@gmail.com>
Mon, 10 Oct 2016 03:24:15 +0000 (20:24 -0700)
committerGitHub <noreply@github.com>
Mon, 10 Oct 2016 03:24:15 +0000 (20:24 -0700)
Fix Travis errors due to npm/npm#14042.


Trivial merge
Mirror of https://github.com/twbs/bootstrap.git