]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'master' into develop
authorKevin Ball <kmball11@gmail.com>
Wed, 2 Aug 2017 12:57:50 +0000 (05:57 -0700)
committerKevin Ball <kmball11@gmail.com>
Wed, 2 Aug 2017 12:57:50 +0000 (05:57 -0700)
1  2 
docs/pages/menu.md
docs/pages/off-canvas.md
docs/pages/prototyping-utilities.md
docs/pages/xy-grid.md
scss/typography/_base.scss
test/visual/menu/menu-icons-flex.html
test/visual/menu/menu-icons-float.html

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge