Merge branch 'develop' into feature/ajaxSearch
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Jan 2019 17:53:56 +0000 (12:53 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Jan 2019 17:53:56 +0000 (12:53 -0500)
commit832456ad09e979dc23cb636cf181db6482d5d765
treea605eaa78912f767fce20ee87553f0c600a9868f
parent1d0814823e602989a477d27a269e61449953be2f
parent2a28b54a4dc3df7d271a8ab2f727045b15b4d07d
Merge branch 'develop' into feature/ajaxSearch
models/front/members/list.php
setup/shortcodes.php
setup/validActions.php