]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
projects / thirdparty / foundation / foundation-sites.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a241413 492860e)
Merge branch 'develop' into fix/10585_offcanvas_incanvas_option 10969/head
authorSassNinja <kai.falkowski@gmail.com>
Tue, 20 Mar 2018 09:28:48 +0000 (10:28 +0100)
committerSassNinja <kai.falkowski@gmail.com>
Tue, 20 Mar 2018 09:28:48 +0000 (10:28 +0100)
commit4858ec512982acd7c7d812e55ead90432e7116b5
tree77e49afb01ce6cbb87375c69567870d50c630217tree
parenta241413e0ba32d4a10cbeda0c4ec0fa7080672e6commit | diff
parent492860eb05294113554e5722aad5f2fd52581fcacommit | diff
Merge branch 'develop' into fix/10585_offcanvas_incanvas_option

# Conflicts:
# js/foundation.offcanvas.js
js/foundation.offcanvas.js diff1 | diff2 | blob | history
Mirror of https://github.com/foundation/foundation-sites.git