]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'develop' into feature/update-zurb-urls 11987/head
authorJoe Workman <joe@workmanmail.com>
Fri, 27 Mar 2020 20:24:32 +0000 (13:24 -0700)
committerJoe Workman <joe@workmanmail.com>
Fri, 27 Mar 2020 20:24:32 +0000 (13:24 -0700)
# Conflicts:
# docs/partials/footer.html
# package.nuspec

1  2 
bower.json
docs/layout/default.html
package.json
package.nuspec

diff --cc bower.json
Simple merge
Simple merge
diff --cc package.json
Simple merge
diff --cc package.nuspec
index 49a695ac89647c8b94e4ee1cdd636d5d871e5ef8,95f5f4f54c48a453f345058fb83cec15445669fc..7b1283c74c11944539aef90b840ad4af2f8b0392
@@@ -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"/>