]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
projects / thirdparty / foundation / foundation-sites.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7dffac1 f29e2d2)
Merge branch 'develop' of github.com:zurb/foundation-sites into fix/fix-es6-plugins...
authorNicolas Coden <nicolas@ncoden.fr>
Thu, 1 Mar 2018 21:20:56 +0000 (22:20 +0100)
committerNicolas Coden <nicolas@ncoden.fr>
Thu, 1 Mar 2018 21:20:56 +0000 (22:20 +0100)
1  2 
test/javascript/core/core.js patch | diff1 | diff2 | blob | history

diff --cc test/javascript/core/core.js
Simple merge
Mirror of https://github.com/foundation/foundation-sites.git