]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22f9c8f 22baa81)
Merge branch 'master' into v3.3.0
authorMark Otto <markdotto@gmail.com>
Wed, 29 Oct 2014 16:45:09 +0000 (09:45 -0700)
committerMark Otto <markdotto@gmail.com>
Wed, 29 Oct 2014 16:45:09 +0000 (09:45 -0700)
1  2 
package.json patch | diff1 | diff2 | blob | history
test-infra/npm-shrinkwrap.json patch | diff1 | diff2 | blob | history

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