Merging develop back into this branch
authorLaury GvR <laury@gaslightmedia.com>
Mon, 17 Apr 2017 18:39:24 +0000 (14:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 17 Apr 2017 18:39:24 +0000 (14:39 -0400)
commit58ad30ec23350d4f4d6535a3a16395708b799a6f
tree134888f944cad02e2b9f9f94be2f996997414687
parent751621bb457619044f84083c32c4a456ab49fdf4
parente0543c6982470f681b47f0539240c2c3826950fb
Merging develop back into this branch
14 files changed:
models/admin/member/memberInfo.php
models/admin/members/list.php
setup/frontHooks.php
views/admin/dashboardWidget/index.html
views/admin/management/header.html
views/admin/management/index.html
views/admin/member/header.html
views/admin/member/index.html
views/admin/member/memberInfo.html
views/admin/member/memberInfo/editMedia.html
views/admin/member/memberInfo/editProfile.html
views/admin/member/memberInfo/editProfileAddress.html
views/admin/members/index.html
views/admin/members/list.html