]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'develop' into v6.3
authorKevin Ball <kmball11@gmail.com>
Sat, 29 Oct 2016 19:24:47 +0000 (12:24 -0700)
committerKevin Ball <kmball11@gmail.com>
Sat, 29 Oct 2016 19:24:47 +0000 (12:24 -0700)

Trivial merge