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: 946e9ec b91f36d)

author	Kevin Ball <kmball11@gmail.com>
	Wed, 7 Dec 2016 17:33:08 +0000 (09:33 -0800)
committer	Kevin Ball <kmball11@gmail.com>
	Wed, 7 Dec 2016 17:33:08 +0000 (09:33 -0800)
commit	db75e3399c4811373c9bc514980909c201798d55
tree	3a8f04bd0fa0a3cda5d369d640644f9bf2f47a81	tree
parent	946e9ec83035d1ee6b37adda188a9990e6431e44	commit \| diff
parent	b91f36d89ef5518c7a74ef18f7de8df8aaabea0d	commit \| diff

Merge branch 'v6.3' into develop

bower.json	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
scss/_global.scss	diff1 \|	diff2 \|	blob \| history
scss/foundation.scss	diff1 \|	diff2 \|	blob \| history
scss/settings/_settings.scss	diff1 \|	diff2 \|	blob \| history
scss/util/_breakpoint.scss	diff1 \|	diff2 \|	blob \| history
scss/util/_mixins.scss	diff1 \|	diff2 \|	blob \| history

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