]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f7b04a 68b3e3f)
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Sun, 9 Mar 2014 23:11:04 +0000 (16:11 -0700)
committerMark Otto <otto@github.com>
Sun, 9 Mar 2014 23:11:04 +0000 (16:11 -0700)
Conflicts:
Gruntfile.js

1  2 
Gruntfile.js patch | diff1 | diff2 | blob | history

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