Merge branch 'release/1.3.3' v1.3.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Sep 2016 15:16:32 +0000 (11:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Sep 2016 15:16:32 +0000 (11:16 -0400)
1  2 
index.php

diff --cc 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