From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 28 Oct 2016 12:12:19 +0000 (-0400)
Subject: Merge branch 'develop' into feature/eventAmenities
X-Git-Tag: v1.5.4^2~35^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fd389d4412b3c08ea507f67335d98964d14a724a;p=WP-Plugins%2Fglm-member-db-events.git

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

fd389d4412b3c08ea507f67335d98964d14a724a
diff --cc index.php
index d63eba8,413dff4..700d452
--- a/index.php
+++ b/index.php
@@@ -38,8 -38,8 +38,8 @@@
   *  so that we're sure the other add-ons see an up to date
   *  version from this plugin.
   */
- define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.5.0');
+ define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.5.2');
 -define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.22');
 +define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.0');
  
  // This is the minimum version of the GLM Members DB plugin require for this plugin.
  define('GLM_MEMBERS_EVENTS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '1.0.58');