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: c821394 7133ba8)

author	Geoff Kimball <geoff@zurb.com>
	Fri, 26 Feb 2016 19:29:56 +0000 (11:29 -0800)
committer	Geoff Kimball <geoff@zurb.com>
	Fri, 26 Feb 2016 19:29:56 +0000 (11:29 -0800)
commit	4c9530f3dc0da01330af197d8af6ce3122a0878a
tree	9a7e25c5f15600178e290f312952d47a78f97c41	tree
parent	c821394a761e26152a7bff540e69f9611bd9807b	commit \| diff
parent	7133ba8cc561c8ed7ba07ccc6f54862a2013571a	commit \| diff

Merge branch master into 6.2-stable

docs/assets/scss/docs.scss	diff1 \|	diff2 \|	blob \| history
docs/layout/default.html	diff1 \|	diff2 \|	blob \| history
docs/pages/flex-grid.md	diff1 \|	diff2 \|	blob \| history
docs/pages/kitchen-sink.md	diff1 \|	diff2 \|	blob \| history
docs/pages/menu.md	diff1 \|	diff2 \|	blob \| history
js/foundation.toggler.js	diff1 \|	diff2 \|	blob \| history
scss/components/_media-object.scss	diff1 \|	diff2 \|	blob \| history

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