From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 25 Nov 2015 13:45:37 +0000 (-0500)
Subject: Merge tag 'v1.0.2' into develop
X-Git-Tag: v1.0.3~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=557bbb0d9185b865cedbaa3b1a66d24a71d54965;p=WP-Plugins%2FGlmPayments.git

Merge tag 'v1.0.2' into develop

v1.0.2

Conflicts:
	includes/payment-display.php
---

557bbb0d9185b865cedbaa3b1a66d24a71d54965
diff --cc includes/payment-display.php
index 98268bd,8c5b3a8..3b3c528
--- a/includes/payment-display.php
+++ b/includes/payment-display.php
@@@ -76,8 -76,8 +76,9 @@@
                                              "Organization: " . $organization;
                          
                          $message = print_r($clientInfo, true);
-                         mail( 'talarico@gaslightmedia.com', 'GLM Payment Form', $message, $headers);
+                         mail( 'billing@gaslightmedia.com', 'GLM Payment Form', $message, $headers);
+ 
 +
  			header("Location:".site_url().$_SERVER['REQUEST_URI']);
  			exit;
  		}