From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 6 Aug 2018 17:47:02 +0000 (-0400)
Subject: Merge tag 'v2.10.36' into develop
X-Git-Tag: v2.10.37^2~7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9b5766257fe090cc072b52630d29bc750a005b14;p=WP-Plugins%2Fglm-member-db.git

Merge tag 'v2.10.36' into develop

Version 2.10.36
---

9b5766257fe090cc072b52630d29bc750a005b14
diff --cc index.php
index 26d0d09e,660b2803..00fac69d
--- a/index.php
+++ b/index.php
@@@ -1,9 -1,9 +1,9 @@@
  <?php
  /**
 - * Plugin Name: GLM Members Database
 + * Plugin Name: GLM Associate - Members Plugin
   * Plugin URI: http://www.gaslightmedia.com/
 + * Description: Gaslight Media GLM Associate core plugin and Members database.
-  * Version: 2.10.35
+  * Description: Gaslight Media Members Database.
 - * Version: 2.10.36
   * Author: Gaslight Media
   * Author URI: http://www.gaslightmedia.com/
   * License: GPL2