]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b2d9f9 4b62a93)
Merge branch 'flex-cards' into v4-dev
authorMark Otto <markdotto@gmail.com>
Fri, 23 Dec 2016 05:27:54 +0000 (21:27 -0800)
committerMark Otto <markdotto@gmail.com>
Fri, 23 Dec 2016 05:27:54 +0000 (21:27 -0800)
1  2 
scss/_variables.scss patch | diff1 | diff2 | blob | history

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