From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 12 Jan 2016 20:25:07 +0000 (-0500)
Subject: Merge branch 'develop' into release/1.0.55
X-Git-Tag: v1.0.57^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=bc19e186c1b1a64112ac4a09716dc01b17fb41d8;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' into release/1.0.55

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

bc19e186c1b1a64112ac4a09716dc01b17fb41d8
diff --cc glm-member-db.php
index dc20b214,26604fb3..41d7649c
--- a/glm-member-db.php
+++ b/glm-member-db.php
@@@ -36,7 -36,7 +36,7 @@@
   *  the current version.
   */
  
- define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.55');
 -define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.53');
++define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.56');
  define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.0.43');
  
  /*