]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge remote-tracking branch 'origin/v6.3' into develop
authorCorey Snyder <corey@tangerineindustries.com>
Tue, 29 Nov 2016 18:29:57 +0000 (13:29 -0500)
committerCorey Snyder <corey@tangerineindustries.com>
Tue, 29 Nov 2016 18:29:57 +0000 (13:29 -0500)
1  2 
js/foundation.tooltip.js
scss/components/_off-canvas.scss
scss/forms/_text.scss
scss/grid/_flex-grid.scss

Simple merge
Simple merge
Simple merge
Simple merge