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: a8e8074 3dc33a4)

author	Kevin Ball <kmball11@gmail.com>
	Fri, 21 Oct 2016 20:10:35 +0000 (13:10 -0700)
committer	Kevin Ball <kmball11@gmail.com>
	Fri, 21 Oct 2016 20:10:35 +0000 (13:10 -0700)
commit	1acb3908cb4a6b4a58d0db83510afb224a16accf
tree	d874ba8d9ade86b15a95bba50ce694a57037ac1b	tree \| snapshot
parent	a8e80740e31c12b46762cce5e80890bcc3a6a089	commit \| diff
parent	3dc33a489af2608b107d6e4d9132b574277adb9c	commit \| diff

Merge branch 'develop' into v6.3

14 files changed:

.versions	diff1 \|	diff2 \|	blob \| history
docs/assets/scss/docs.scss	diff1 \|	diff2 \|	blob \| history
docs/pages/kitchen-sink.md	diff1 \|	diff2 \|	blob \| history
js/foundation.accordionMenu.js	diff1 \|	diff2 \|	blob \| history
js/foundation.drilldown.js	diff1 \|	diff2 \|	blob \| history
js/foundation.tabs.js	diff1 \|	diff2 \|	blob \| history
meteor-README.md	diff1 \|	diff2 \|	blob \| history
package.js	diff1 \|	diff2 \|	blob \| history
scss/components/_table.scss	diff1 \|	diff2 \|	blob \| history
scss/forms/_text.scss	diff1 \|	diff2 \|	blob \| history
scss/foundation.scss	diff1 \|	diff2 \|	blob \| history
scss/grid/_classes.scss	diff1 \|	diff2 \|	blob \| history
scss/grid/_flex-grid.scss	diff1 \|	diff2 \|	blob \| history
scss/settings/_settings.scss	diff1 \|	diff2 \|	blob \| history

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