]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into colors-redux
authorMark Otto <markdotto@gmail.com>
Sun, 18 Jun 2017 09:19:34 +0000 (02:19 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 18 Jun 2017 09:19:34 +0000 (02:19 -0700)
1  2 
docs/4.0/getting-started/options.md
scss/_variables.scss

Simple merge
Simple merge