Merge branch 'develop' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Sep 2016 13:22:38 +0000 (09:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Sep 2016 13:22:38 +0000 (09:22 -0400)
commit6c9d9e13367eaa503f1aff87537e6aeac124934b
treedcbea46199f9911e5a727a9beb1cf259416bf120
parent4c442949697fe5e6116462d206b3596092383b1b
parentc6659c347854337e24b4234da9d2f360b69f22c7
Merge branch 'develop' into feature/lauryAdminPolishing
setup/frontHooks.php
setup/validActions.php