]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
Merge branch 'master-6.5.3' into master-new
authorJoe Workman <joe@workmanmail.com>
Mon, 21 Oct 2019 22:10:40 +0000 (15:10 -0700)
committerJoe Workman <joe@workmanmail.com>
Mon, 21 Oct 2019 22:10:40 +0000 (15:10 -0700)
commit0826719ea0f007c7d4816e2c133724724efb129d
tree33e363365668625a8117f622aed8fde3801567f0
parent288c3fb393a29eff9f3ea3e083a4672cab5b5804
parentb58d2354f54bb601f1b4ae7ee8536ac7ccfb18ba
Merge branch 'master-6.5.3' into master-new

# Conflicts:
# CONTRIBUTING.md
# README.md
# docs/pages/abide.md
# docs/pages/grid.md
# docs/pages/installation.md
# docs/pages/motion-ui.md
# docs/pages/prototyping-utilities.md
# docs/pages/sass.md
# docs/partials/footer.html
# js/foundation.abide.js
# js/foundation.magellan.js
# package-lock.json
# package.json
# yarn.lock
docs/layout/default.html
docs/pages/xy-grid.md
test/javascript/components/offcanvas.js