]> 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: ad2bf66 bca7ae0)
Merge branch 'master' into develop
authorKevin Ball <kmball11@gmail.com>
Mon, 9 Jan 2017 23:14:45 +0000 (15:14 -0800)
committerKevin Ball <kmball11@gmail.com>
Mon, 9 Jan 2017 23:14:45 +0000 (15:14 -0800)

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