]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: daedcca 1885bfe)
Merge pull request #20394 from TrigenSoftware/v4-dev
authorMark Otto <markd.otto@gmail.com>
Mon, 22 Aug 2016 00:49:46 +0000 (17:49 -0700)
committerGitHub <noreply@github.com>
Mon, 22 Aug 2016 00:49:46 +0000 (17:49 -0700)
Fix package.json

1  2 
package.json patch | diff1 | diff2 | blob | history

diff --cc package.json
Simple merge
Mirror of https://github.com/twbs/bootstrap.git