]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0d60b1 08de413)
Merge branch 'ntwb-editorconfig' into 3.0.0-wip
authorMark Otto <otto@github.com>
Tue, 23 Apr 2013 05:58:33 +0000 (22:58 -0700)
committerMark Otto <otto@github.com>
Tue, 23 Apr 2013 05:58:33 +0000 (22:58 -0700)
1  2 
component.json patch | diff1 | diff2 | blob | history

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