]> 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: e35f348 2b5160c)
Merge branch 'master' into develop
authorKevin Ball <kmball11@gmail.com>
Fri, 7 Oct 2016 17:21:49 +0000 (10:21 -0700)
committerKevin Ball <kmball11@gmail.com>
Fri, 7 Oct 2016 17:21:49 +0000 (10:21 -0700)

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