From: Joe Workman <joe@workmanmail.com>
Date: Fri, 27 Mar 2020 20:24:32 +0000 (-0700)
Subject: Merge branch 'develop' into feature/update-zurb-urls
X-Git-Tag: v6.6.2^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11987%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into feature/update-zurb-urls

# Conflicts:
#	docs/partials/footer.html
#	package.nuspec
---

7665622576564d0c0e7e54e2e78a0a55f0edaf34
diff --cc package.nuspec
index 49a695ac8,95f5f4f54..7b1283c74
--- a/package.nuspec
+++ b/package.nuspec
@@@ -10,9 -10,9 +10,9 @@@
          <description>The most advanced responsive front-end framework in the world.</description>
          <tags>css scss sass js responsive mobile-first framework</tags>
  
 -        <projectUrl>http://foundation.zurb.com/sites</projectUrl>
 -        <iconUrl>https://foundation.zurb.com/assets/img/icons/foundation-favicon.ico</iconUrl>
 +        <projectUrl>https://get.foundation/sites</projectUrl>
 +        <iconUrl>https://get.foundation/assets/img/icons/foundation-favicon.ico</iconUrl>
-         <releaseNotes>https://github.com/foundation/foundation-sites/releases/tag/v6.5.3</releaseNotes>
+         <releaseNotes>https://github.com/foundation/foundation-sites/releases/tag/v6.6.1</releaseNotes>
          <licenseUrl>https://github.com/foundation/foundation-sites/blob/develop/LICENSE</licenseUrl>
          <copyright>Copyright 2017-2018</copyright>
          <repository type="git" url="https://github.com/foundation/foundation-sites"/>