com web/php: Merging pr/158, and solving the conflicts caused.: archive/archive.xml
| From: | Eli White | Date: | Tue, 20 Jun 2017 15:44:48 +0000 |
| Subject: | com web/php: Merging pr/158, and solving the conflicts caused.: archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-26094@lists.php.net to get a copy of this message | ||
Commit: 68332d0ed159d9902f97c16da22450721bd939e9
Author: Eli White <eli@eliw.com> Tue, 20 Jun 2017 11:44:48 -0400
Parents: 534bbc3de4f316895c2643af03d492086ff36f74 fead384dbe163e4973c3dc4f023930952eb0bd5d
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=68332d0ed159d9902f97c16da22450721bd939e9
Log:
Merging pr/158, and solving the conflicts caused.
Changed paths:
MM archive/archive.xml
Diff:
diff --cc archive/archive.xml
index 1c609fa,7895413..3128a67
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,7 +9,8 @@@
<uri>http://php.net/contact</uri>
<email>php-webmaster@lists.php.net</email>
</author>
+ <xi:include href="entries/2017-06-14-1.xml"/>
+ <xi:include href="entries/2017-06-09-1.xml"/>
<xi:include href="entries/2017-06-08-3.xml"/>
<xi:include href="entries/2017-06-08-2.xml"/>
<xi:include href="entries/2017-06-08-1.xml"/>