]> 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: 463f0da 0a20dcd)
Merge branch 'develop' into release/6.4.0
authorKevin Ball <kmball11@gmail.com>
Thu, 1 Jun 2017 19:46:28 +0000 (12:46 -0700)
committerKevin Ball <kmball11@gmail.com>
Thu, 1 Jun 2017 19:46:28 +0000 (12:46 -0700)

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