]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1109ecc 5dae7f0)
Merge branch 'btn_input_split_variables' of https://github.com/isychev/bootstrap...
authorMark Otto <markdotto@gmail.com>
Mon, 23 Oct 2017 02:59:20 +0000 (19:59 -0700)
committerMark Otto <markdotto@gmail.com>
Mon, 23 Oct 2017 02:59:20 +0000 (19:59 -0700)
1  2 
scss/_button-group.scss patch | diff1 | diff2 | blob | history
scss/_buttons.scss patch | diff1 | diff2 | blob | history
scss/_input-group.scss patch | diff1 | diff2 | blob | history

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