Merge branch 'develop' into feature/Canonical
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 12 Oct 2015 15:32:56 +0000 (11:32 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 12 Oct 2015 15:32:56 +0000 (11:32 -0400)
commitdcebde50e3d74c39d388c1e26f588e47ae3a99ef
treeefc94b45bbad60791303f2d168114dff0400da64
parent8129f80f22b26e360b5836afd093230af6821ad5
parent0d03a033a525fbfa6da9e922cd4e52e4d265476c
Merge branch 'develop' into feature/Canonical
glm-member-db.php
models/front/members/list.php