]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #18038 from twbs/fix-16947
authorChris Rebert <github@chrisrebert.com>
Tue, 27 Oct 2015 16:38:20 +0000 (09:38 -0700)
committerChris Rebert <github@chrisrebert.com>
Tue, 27 Oct 2015 16:38:20 +0000 (09:38 -0700)
Make heading class styles trump heading element styles

1  2 
scss/_type.scss

diff --cc scss/_type.scss
Simple merge