Merge branch 'feature/memberDashboard' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Mon, 17 Oct 2016 14:55:29 +0000 (10:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 17 Oct 2016 14:55:29 +0000 (10:55 -0400)
commit3c66564b1598ffa6b8d176ce8138f99da70454df
tree92575fc49f87ba64643dd85f7385cc027b6b7cbb
parent7227c5ee75c5d54499a37045a373ef6daec43e54
parent578d695e0018f96684cb9eb11d87b4568a659c6f
Merge branch 'feature/memberDashboard' into feature/lauryAdminPolishing
css/admin.css
setup/adminHooks.php
views/admin/member/index.html
views/admin/members/index.html