]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into colors-redux
authorMark Otto <markdotto@gmail.com>
Mon, 19 Jun 2017 01:32:42 +0000 (18:32 -0700)
committerMark Otto <markdotto@gmail.com>
Mon, 19 Jun 2017 01:32:42 +0000 (18:32 -0700)
1  2 
assets/scss/_sidebar.scss
scss/_card.scss

Simple merge
diff --cc scss/_card.scss
Simple merge