]> 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: 4a32153 e0ebb0e)
Merge pull request #10377 from hikouki/extend
authorKevin Ball <kmball11@gmail.com>
Tue, 11 Jul 2017 21:53:20 +0000 (14:53 -0700)
committerGitHub <noreply@github.com>
Tue, 11 Jul 2017 21:53:20 +0000 (14:53 -0700)
Fixed: I made the option posible recursively merge.


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