]> git.ipfire.org Git - thirdparty/foundation/foundation-emails.git/commit
fixes merge conflict
authorRafiBomb <rafi@zurb.com>
Wed, 19 Apr 2017 22:05:30 +0000 (15:05 -0700)
committerRafiBomb <rafi@zurb.com>
Wed, 19 Apr 2017 22:05:30 +0000 (15:05 -0700)
commitdbb113bf20b49a285e91bbc6de8a943683bf4afc
tree02ca5308ecaf1129dca98ecb6f79b9c0a468b09b
parent4f508fc19b5f86f86700e42f0d390acc4bf96049
parentd0c2f1ae50805c08be8b557acfa24d388e6f017a
fixes merge conflict
docs/pages/sass-guide.md
docs/partials/component-list.html
docs/partials/footer.html
templates/hero.html
templates/sidebar-hero.html