From: Chuck Scott <cscott@gaslightmedia.com>
Date: Fri, 8 Jul 2016 16:00:52 +0000 (-0400)
Subject: Merge tag 'v1.1.7' into develop
X-Git-Tag: v1.1.8^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=094e26df98a5a3ea7ce5802b372e76574b6af886;p=WP-Plugins%2Fglm-member-db-packaging.git

Merge tag 'v1.1.7' into develop

Added package title as page title to package detail page.

Conflicts:
	index.php
	setup/frontHooks.php
---

094e26df98a5a3ea7ce5802b372e76574b6af886
diff --cc index.php
index 5a649dc,a086128..d760cf1
--- a/index.php
+++ b/index.php
@@@ -37,8 -37,8 +37,8 @@@
   *  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.1.6');
+ define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.1.7');
 -define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.0');
 +define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.2');
  
  // This is the minimum version of the GLM Members DB plugin require for this plugin.
  define('GLM_MEMBERS_PACKAGING_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.0.0');