Merge branch 'develop' into feature/amenityGroups
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Jun 2016 12:53:40 +0000 (08:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Jun 2016 12:53:40 +0000 (08:53 -0400)
commit5e76e5a02891dd6a8f066a9312dfa5ea9e85a778
treec51e4da8a9942213ffb1e9a6ed8d8fc832cac593
parent9eb397c2a468740c6ffebed588696eed60a86e99
parent3ee24fe04f2196736b40de698e8b663da4204d82
Merge branch 'develop' into feature/amenityGroups
models/front/members/list.php