com playground: Merge branch 'test': test_mail
| From: | Alexander Moskaliov | Date: | Sat, 31 Mar 2012 17:54:11 +0000 |
| Subject: | com playground: Merge branch 'test': test_mail | ||
| Groups: | php.test | ||
| Request: | Send a blank email to php-test+get-1039@lists.php.net to get a copy of this message | ||
Commit: 8a05666132c49ca5108f1006a67e28048182d7d8
Author: Alexander Moskaliov <irker@irker.net> Sat, 31 Mar 2012 21:54:11 +0400
Parents: 5ca1b63d23ef6cffdfdada88dc418b182f603b84 d9dec80be7e847e44ee8b0291b10a4955bdedd6a
Branches: master
Link: http://git.php.net/?p=playground.git;a=commitdiff;h=8a05666132c49ca5108f1006a67e28048182d7d8
Log:
Merge branch 'test'
Conflicts:
test_mail
Changed paths:
MM test_mail
Diff:
diff --cc test_mail
index e7d934f,703a935..f47cd7b
--- a/test_mail
+++ b/test_mail
@@@ -1,7 -1,7 +1,9 @@@
+245adsffdgdasfdsfasdfsome
+ asdfadsffdgdasfdsfasdfsome
some
some
some
++added by merge commit
some
some
some