From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 29 Feb 2016 19:59:05 +0000 (-0500)
Subject: Merge branch 'develop' into feature/steve
X-Git-Tag: v1.0.0^2~185
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=b7aadd533bb4ceaa5cf547335b33586802d2ca9f;p=WP-Plugins%2Fglm-member-db-events.git

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

b7aadd533bb4ceaa5cf547335b33586802d2ca9f
diff --cc setup/validActions.php
index 484ff11,d5638ac..2fd32b2
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@@ -43,8 -43,12 +43,11 @@@ $glmMembersEventsAddOnValidActions = ar
              'add' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG,
              'categories' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG
          ),
+         'management' => array(
+             'events' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG
+         )
      ),
      'frontActions' => array(
 -/*
          'events' => array(
              'list' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG,
              'detail' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG