]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into v4-navbars
authorMark Otto <markdotto@gmail.com>
Sun, 24 Jul 2016 04:05:18 +0000 (21:05 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 24 Jul 2016 04:05:18 +0000 (21:05 -0700)
1  2 
scss/_variables.scss

Simple merge