]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa6a6db e9c32fd)
Merge branch 'jblotus-patch-1' into 2.2.2-wip
authorMark Otto <otto@github.com>
Fri, 30 Nov 2012 05:06:20 +0000 (21:06 -0800)
committerMark Otto <otto@github.com>
Fri, 30 Nov 2012 05:06:20 +0000 (21:06 -0800)
1  2 
package.json patch | diff1 | diff2 | blob | history

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