Merge from develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 12 Nov 2018 15:38:27 +0000 (10:38 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 12 Nov 2018 15:38:27 +0000 (10:38 -0500)
commit5cdcdb90a4745fb46bcf0610c366615e472881fc
tree0f90ff043ea72b16c2476369a6232d37e6eb4418
parent4431ae0d5513b8f16e22ae0f4fef51900c86ad58
parent580216bf45de3248451fe7a4641229516ac7ef58
Merge from develop
controllers/admin.php
setup/adminHooks.php
setup/validActions.php