]> 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: 0605c26 9c6ee07)
Merge branch 'master' into develop
authorKevin Ball <kmball11@gmail.com>
Tue, 27 Jun 2017 18:22:56 +0000 (11:22 -0700)
committerKevin Ball <kmball11@gmail.com>
Tue, 27 Jun 2017 18:22:56 +0000 (11:22 -0700)

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