]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e589cdb e3b55aa)
Merge branch 'v4-dev' into v4-form-sizing 19121/head
authorMark Otto <markdotto@gmail.com>
Mon, 8 Feb 2016 06:48:26 +0000 (22:48 -0800)
committerMark Otto <markdotto@gmail.com>
Mon, 8 Feb 2016 06:48:26 +0000 (22:48 -0800)
1  2 
scss/_forms.scss patch | diff1 | diff2 | blob | history
scss/_variables.scss patch | diff1 | diff2 | blob | history

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