Merge branch 'develop' into feature/moderatedMemberUpdates
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Sep 2018 15:43:27 +0000 (11:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Sep 2018 15:43:27 +0000 (11:43 -0400)
commite35e008d312c4019ae4646a34549c19c4237c274
treefc8c3d4c295ef3525c260da64940117fa09b2f83
parent404ce768e11d242a920dd5d9573fe7825a6281d3
parent121d619a815f7e503a4f1c4474c8287285348777
Merge branch 'develop' into feature/moderatedMemberUpdates
config/plugin.ini
models/admin/member/memberInfo.php
views/admin/member/memberInfo.html
views/admin/members/list.html