]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
authorMark Otto <markdotto@gmail.com>
Wed, 27 Dec 2017 06:28:14 +0000 (22:28 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 27 Dec 2017 06:28:14 +0000 (22:28 -0800)
1  2 
scss/_variables.scss

Simple merge