]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46fbaab 9bdb6d1)
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
authorMark Otto <markdotto@gmail.com>
Thu, 13 Aug 2015 03:01:38 +0000 (20:01 -0700)
committerMark Otto <markdotto@gmail.com>
Thu, 13 Aug 2015 03:01:38 +0000 (20:01 -0700)
1  2 
Gruntfile.js patch | diff1 | diff2 | blob | history

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