[git] commit playground.git: test_email
| From: | Alexander Moskaliov | Date: | Tue, 20 Mar 2012 07:05:19 +0000 |
| Subject: | [git] commit playground.git: test_email | ||
| References: | 1 | Groups: | php.test |
| Request: | Send a blank email to php-test+get-959@lists.php.net to get a copy of this message | ||
Commit: 95cecc0f7a7501ea965f9216f48068acfe183646
Author: Alexander Moskaliov(irker@irker.net) Tue, 20 Mar 2012 10:54:10 +0400
Committer: Alexander Moskaliov(irker@irker.net) Tue, 20 Mar 2012 10:54:10 +0400
Parents: 125c8a6a73ece09d6bcbc6a777f1e74f79c8eb3b edbd4c2a10a23643c91c5730a2aff90045ddcb28
Link: http://git.php.net/?p=playground.git;a=commitdiff;h=95cecc0f7a7501ea965f9216f48068acfe183646
Log:
Merge branch 'test'
Conflicts:
test_email
Changed paths:
MM test_email
Diff:
95cecc0f7a7501ea965f9216f48068acfe183646
diff --combined test_email
index d59fd63,2f4e349..f0b2308
--- a/test_email
+++ b/test_email
@@@ -1,7 -1,1 +1,8 @@@
+try it
+test email notification
+sadftest again
+asdfasdf
+asdfasdf
+
+asfasdf
+ sdf