From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 21 Jan 2016 15:44:44 +0000 (-0500)
Subject: Merge tag 'v1.0.20' into develop
X-Git-Tag: v1.1.0^2~10
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=bb9267fa66b89c0484305d405b729c70413540b6;p=WP-Plugins%2Fglm-member-db-packaging.git

Merge tag 'v1.0.20' into develop

1.0.20

Conflicts:
	glm-member-db-packaging.php
---

bb9267fa66b89c0484305d405b729c70413540b6
diff --cc glm-member-db-packaging.php
index 6547cba,3ad02c1..478d13e
--- a/glm-member-db-packaging.php
+++ b/glm-member-db-packaging.php
@@@ -32,13 -32,9 +32,13 @@@
   *  made together with the DB_VERSION below. ONLY bump the DB
   *  version when there's a change in the database!! Use the
   *  version nunmber of that release for the DB version.
 + *
 + *  We check the plugin version stored in the WordPress option below
 + *  so that we're sure the other add-ons see an up to date
 + *  version from this plugin.
   */
- define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.0.19');
+ define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.0.20');
 -define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '0.0.2');
 +define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.0');
  
  // This is the minimum version of the GLM Members DB plugin require for this plugin.
  define('GLM_MEMBERS_PACKAGING_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '1.0.57');