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: 75d1351 7a6ed60)

author	RafiBomb <rafi@zurb.com>
	Fri, 8 Apr 2016 20:23:52 +0000 (13:23 -0700)
committer	RafiBomb <rafi@zurb.com>
	Fri, 8 Apr 2016 20:23:52 +0000 (13:23 -0700)
commit	5e0b3b4ba5acba765fcb65bf5256bf2c0d681097
tree	762199b146fd8bff2c4725dbda9698212fd751a8	tree \| snapshot
parent	75d1351fd05da3621c0aaf6caf66f396c533872c	commit \| diff
parent	7a6ed604689635ddda430ae46a100d30c415959b	commit \| diff

fixes merge conflicts

17 files changed:

bower.json	diff1 \|	diff2 \|	blob \| history
composer.json	diff1 \|	diff2 \|	blob \| history
dist/foundation-flex.css	diff1 \|	diff2 \|	blob \| history
dist/foundation-flex.min.css	diff1 \|	diff2 \|	blob \| history
dist/foundation-rtl.css	diff1 \|	diff2 \|	blob \| history
dist/foundation-rtl.min.css	diff1 \|	diff2 \|	blob \| history
dist/foundation.css	diff1 \|	diff2 \|	blob \| history
dist/foundation.js	diff1 \|	diff2 \|	blob \| history
dist/foundation.min.css	diff1 \|	diff2 \|	blob \| history
dist/foundation.min.js	diff1 \|	diff2 \|	blob \| history
docs/pages/installation.md	diff1 \|	diff2 \|	blob \| history
js/foundation.core.js	diff1 \|	diff2 \|	blob \| history
meteor-README.md	diff1 \|	diff2 \|	blob \| history
package.js	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
scss/foundation.scss	diff1 \|	diff2 \|	blob \| history
scss/settings/_settings.scss	diff1 \|	diff2 \|	blob \| history

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