]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0de5ad 0822cc5)
Merge branch 'master' of https://github.com/cvrebert/bootstrap into 2.3.3-wip
authorMark Otto <otto@github.com>
Fri, 26 Jul 2013 05:17:42 +0000 (22:17 -0700)
committerMark Otto <otto@github.com>
Fri, 26 Jul 2013 05:17:42 +0000 (22:17 -0700)
1  2 
package.json patch | diff1 | diff2 | blob | history

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