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
(parent: 220e3a4) | patch

author	Kevin Ball <kmball11@gmail.com>
	Mon, 25 Apr 2016 16:59:31 +0000 (09:59 -0700)
committer	Kevin Ball <kmball11@gmail.com>
	Mon, 25 Apr 2016 16:59:31 +0000 (09:59 -0700)
commit	0b1d16ea82f165ff49bbc01cd7ccbe5b57a6c162
tree	da31b052304c80380bdc4d550b8ca2e11463dfea	tree \| snapshot
parent	220e3a49abc0a52c0549cb199004344ffd3853c6	commit \| diff

Revert "fixes merge conflicts"

This reverts commit 5e0b3b4ba5acba765fcb65bf5256bf2c0d681097, reversing
changes made to 7a6ed604689635ddda430ae46a100d30c415959b.

17 files changed:

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

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