Merge branch 'feature/memberDashboard' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Sep 2016 13:19:15 +0000 (09:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Sep 2016 13:19:15 +0000 (09:19 -0400)
commit4c442949697fe5e6116462d206b3596092383b1b
tree5394b6d06391737bf32f56934286d86cdbc2bcd1
parent8d84e1d4685969cd921e3abcea0c36b519f4017c
parent760ec61a7af924d3b49cc1852d5b3bf3aac14af2
Merge branch 'feature/memberDashboard' into feature/lauryAdminPolishing
css/admin.css
setup/frontHooks.php
views/admin/management/index.html
views/admin/member/index.html