Merge branch 'develop' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Nov 2016 15:20:09 +0000 (11:20 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Nov 2016 15:20:09 +0000 (11:20 -0400)
commiteae34d0739509f6c8a1dc685040a338645f48c62
tree1c171278e23d7bf5fd2c832a0526898345b96efe
parent3c66564b1598ffa6b8d176ce8138f99da70454df
parent27be4f75221083c58a452a82b7c2a1655d9df4da
Merge branch 'develop' into feature/lauryAdminPolishing
setup/adminHooks.php
setup/adminMenus.php
setup/frontHooks.php
views/admin/management/index.html
views/admin/members/header.html
views/admin/members/index.html
views/admin/members/list.html
views/admin/settings/header.html