]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f4af5c 523c5a3)
Merge branch 'provide-custom-scss' of https://github.com/stephaniepurvis/bootstrap...
authorMark Otto <markdotto@gmail.com>
Sun, 17 Jan 2016 23:51:49 +0000 (15:51 -0800)
committerMark Otto <markdotto@gmail.com>
Sun, 17 Jan 2016 23:51:49 +0000 (15:51 -0800)
1  2 
scss/bootstrap.scss patch | diff1 | diff2 | blob | history

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