]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 447fc28 d5e474b)
Merge branch 'v4-dev' into v4-font-stack
authorMark Otto <markdotto@gmail.com>
Sat, 6 Feb 2016 23:01:44 +0000 (15:01 -0800)
committerMark Otto <markdotto@gmail.com>
Sat, 6 Feb 2016 23:01:44 +0000 (15:01 -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