Merge branch 'develop' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Wed, 8 Mar 2017 19:48:03 +0000 (14:48 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 8 Mar 2017 19:48:03 +0000 (14:48 -0500)
commit981d2c45b572f7d8efcce58539cf96827b324c3c
treeef09d742b01b6e504c0f17b1da72c1f2f31f060f
parent12e58984974ab00d8f3058bb79b7f3be6f7c6e6f
parent1d5afa2aac15201553a6b4fc6720300a7bfed1a6
Merge branch 'develop' into feature/lauryAdminPolishing
setup/frontHooks.php
views/admin/management/index.html
views/admin/member/index.html
views/admin/members/list.html