From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 20 Jun 2016 16:51:03 +0000 (-0400)
Subject: Merge tag 'v2.1.9' into develop
X-Git-Tag: v2.1.10^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3ee24fe04f2196736b40de698e8b663da4204d82;p=WP-Plugins%2Fglm-member-db.git

Merge tag 'v2.1.9' into develop

Updated version #

Conflicts:
	index.php
---

3ee24fe04f2196736b40de698e8b663da4204d82
diff --cc index.php
index 46c08447,10836d5b..b9622e06
--- a/index.php
+++ b/index.php
@@@ -38,8 -38,8 +38,8 @@@
   *
   */
  
- define('GLM_MEMBERS_PLUGIN_VERSION', '2.1.4');
+ define('GLM_MEMBERS_PLUGIN_VERSION', '2.1.9');
 -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.9');
 +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.10');
  
  // Check if plugin version is not current in WordPress option and if needed updated it
  if (GLM_MEMBERS_PLUGIN_VERSION != get_option('glmMembersDatabasePluginVersion')) {