Merge branch 'develop' into feature/memberDashboard feature/memberDashboard
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Oct 2016 19:14:23 +0000 (15:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Oct 2016 19:14:23 +0000 (15:14 -0400)
commit578d695e0018f96684cb9eb11d87b4568a659c6f
tree7adbed07d2ffcfa2b7e761c72926d6139fdb0b57
parent122c975a3e7b2a858f66d4517b762d2e50ebcde6
parent1761863e0c029a244be2094778b66a60b90d568f
Merge branch 'develop' into feature/memberDashboard
css/admin.css
models/admin/member/index.php
views/admin/member/index.html