]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'isapir-develop' into develop
authorKevin Ball <kmball11@gmail.com>
Mon, 18 Sep 2017 18:33:24 +0000 (11:33 -0700)
committerKevin Ball <kmball11@gmail.com>
Mon, 18 Sep 2017 18:33:24 +0000 (11:33 -0700)

Trivial merge