From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 4 Oct 2016 14:14:28 +0000 (-0400)
Subject: Merge branch 'develop' into feature/memberDashboard
X-Git-Tag: v2.7.0^2~1^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=afe410cdc1285fe895670c3acb2c0f282dcc87a9;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' into feature/memberDashboard
---

afe410cdc1285fe895670c3acb2c0f282dcc87a9
diff --cc setup/validActions.php
index e600035c,c43f105a..c0ab1a35
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@@ -89,12 -85,15 +89,13 @@@ $glmMembersValidActions = array
      ),
      'frontActions' => array(
          'members' => array(
-             'list'   => 'glm-member-db',
-             'detail' => 'glm-member-db',
+             'list'                  => 'glm-member-db',
+             'detail'                => 'glm-member-db',
+             'featured'              => 'glm-member-db'
          ),
          'error' => array(
 -            'index'                 => 'glm-member-db',
 -            'badAction'             => 'glm-member-db'
 -        )
 -    )
 +            'index'     => 'glm-member-db',
 +            'badAction' => 'glm-member-db',
 +        ),
 +    ),
  );
 -
 -?>