Merge from develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Feb 2019 18:38:47 +0000 (13:38 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Feb 2019 18:38:47 +0000 (13:38 -0500)
commit9e090a0c20ad2e99af339944ed0686d15636833d
tree9396ac3352380a846fecb9e163f8126db9858673
parent8ab47156e471e7dbbdf549264698174d308e9653
parent09e82999cb48744b30fcad68d172881447b1d899
Merge from develop
controllers/admin.php
lib/GlmDataAbstract/DataAbstract.php
models/admin/member/memberInfo.php
models/admin/members/list.php
setup/validActions.php