git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit

]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit

projects / thirdparty / foundation / foundation-sites.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: be3cc2f daa4439)

author	Geoff Kimball <geoff@zurb.com>
	Mon, 8 Feb 2016 22:00:42 +0000 (14:00 -0800)
committer	Geoff Kimball <geoff@zurb.com>
	Mon, 8 Feb 2016 22:00:42 +0000 (14:00 -0800)
commit	b62b274d262f5486cac642c63984398bcb7b1699
tree	d792a06077ad183d097d1afbb2033c1ad9ce4224	tree
parent	be3cc2f6bcaf4932f67b954cef34e41c6d2156f7	commit \| diff
parent	daa4439c89138e781a1e6eff223e1d6a1a5834fa	commit \| diff

Merge develop into 6.2

18 files changed:

docs/pages/flex-grid.md	diff1 \|	diff2 \|	blob \| history
docs/pages/menu.md	diff1 \|	diff2 \|	blob \| history
docs/pages/top-bar.md	diff1 \|	diff2 \|	blob \| history
js/foundation.core.js	diff1 \|	diff2 \|	blob \| history
js/foundation.dropdown.js	diff1 \|	diff2 \|	blob \| history
js/foundation.magellan.js	diff1 \|	diff2 \|	blob \| history
js/foundation.offcanvas.js	diff1 \|	diff2 \|	blob \| history
js/foundation.orbit.js	diff1 \|	diff2 \|	blob \| history
js/foundation.reveal.js	diff1 \|	diff2 \|	blob \| history
js/foundation.slider.js	diff1 \|	diff2 \|	blob \| history
js/foundation.sticky.js	diff1 \|	diff2 \|	blob \| history
js/foundation.tabs.js	diff1 \|	diff2 \|	blob \| history
scss/components/_button-group.scss	diff1 \|	diff2 \|	blob \| history
scss/components/_button.scss	diff1 \|	diff2 \|	blob \| history
scss/components/_callout.scss	diff1 \|	diff2 \|	blob \| history
scss/components/_menu.scss	diff1 \|	diff2 \|	blob \| history
scss/components/_tabs.scss	diff1 \|	diff2 \|	blob \| history
scss/util/_breakpoint.scss	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/foundation/foundation-sites.git