]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into v4-navbars
authorMark Otto <markdotto@gmail.com>
Mon, 3 Oct 2016 02:26:29 +0000 (19:26 -0700)
committerMark Otto <markdotto@gmail.com>
Mon, 3 Oct 2016 02:26:29 +0000 (19:26 -0700)
1  2 
docs/components/navbar.md
scss/_variables.scss

Simple merge
Simple merge