From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 1 Sep 2016 15:16:32 +0000 (-0400)
Subject: Merge branch 'release/1.3.3'
X-Git-Tag: v1.3.3^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=eec4e82d7cbd0af171be1d028718d817b1d00ab6;p=WP-Plugins%2Fglm-member-db-events.git

Merge branch 'release/1.3.3'
---

eec4e82d7cbd0af171be1d028718d817b1d00ab6
diff --cc index.php
index daa3705,4d772b8..7bd5389
--- a/index.php
+++ b/index.php
@@@ -3,7 -3,7 +3,11 @@@
   * Plugin Name: GLM Members Database Events
   * Plugin URI: http://www.gaslightmedia.com/
   * Description: Gaslight Media Members Database.
++<<<<<<< HEAD
 + * Version: 1.3.2
++=======
+  * Version: 1.3.3
++>>>>>>> release/1.3.3
   * Author: Chuck Scott
   * Author URI: http://www.gaslightmedia.com/
   * License: GPL2