From: Chuck Scott <cscott@gaslightmedia.com>
Date: Fri, 2 Oct 2015 11:31:51 +0000 (-0400)
Subject: Merge branch 'develop' into feature/NewSettings
X-Git-Tag: v1.0.28^2~2^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=338b451c51766635a8460539c0c1afcdd51684ae;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' into feature/NewSettings

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

338b451c51766635a8460539c0c1afcdd51684ae
diff --cc glm-member-db.php
index d634d360,a671b1f9..12584ab3
--- a/glm-member-db.php
+++ b/glm-member-db.php
@@@ -3,7 -3,7 +3,7 @@@
   * Plugin Name: GLM Members Database
   * Plugin URI: http://www.gaslightmedia.com/
   * Description: Gaslight Media Members Database.
-  * Version: 1.0.20
 - * Version: 1.0.25
++ * Version: 1.0.26
   * Author: Chuck Scott
   * Author URI: http://www.gaslightmedia.com/
   * License: GPL2
@@@ -19,7 -19,7 +19,7 @@@
   * @package glmMembersDatabase
   * @author Chuck Scott <cscott@gaslightmedia.com>
   * @license http://www.gaslightmedia.com Gaslightmedia
-  * @version 1.0.20
 - * @version 1.0.21
++ * @version 1.0.26
   */
  
  /*