]> 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: 397084a 77d43b8)
Merge pull request #11356 from DanielRuf/fix/use-local-this
authorNicolas Coden <nicolas@ncoden.fr>
Wed, 27 Jun 2018 20:18:02 +0000 (22:18 +0200)
committerGitHub <noreply@github.com>
Wed, 27 Jun 2018 20:18:02 +0000 (22:18 +0200)
fix: resolve invalid conflict resolution #11077 for v6.5


Trivial merge
Mirror of https://github.com/foundation/foundation-sites.git