]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
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)
commit7665622576564d0c0e7e54e2e78a0a55f0edaf34
treefb828c5acef65cc6bd5405c1d6ae08eb4243b01d
parent2aea14d52a2872183f24a50da786cf9eb1e50410
parentd1477a66382502c77659b11d3d4dfcefa45ad726
Merge branch 'develop' into feature/update-zurb-urls

# Conflicts:
# docs/partials/footer.html
# package.nuspec
bower.json
docs/layout/default.html
package.json
package.nuspec