com web/php: Commiting in PHPBenelux and fixing merge issues: archive/archive.xml
| From: | Eli White | Date: | Wed, 16 Aug 2017 17:35:38 +0000 |
| Subject: | com web/php: Commiting in PHPBenelux and fixing merge issues: archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-26305@lists.php.net to get a copy of this message | ||
Commit: a1ae9469e6ad7cd99182d87c234765bdf0c5a54c
Author: Eli White <eli@eliw.com> Wed, 16 Aug 2017 13:35:38 -0400
Parents: e4e6e9155a32833838bfb8ee4c7231730c92c70f 875660d947de8032cdfa4e66a321e79b0e851135
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=a1ae9469e6ad7cd99182d87c234765bdf0c5a54c
Log:
Commiting in PHPBenelux and fixing merge issues
Changed paths:
MM archive/archive.xml
Diff:
diff --cc archive/archive.xml
index c3471d4,1020285..ee48d39
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,9 -9,7 +9,10 @@@
<uri>http://php.net/contact</uri>
<email>php-webmaster@lists.php.net</email>
</author>
+ <xi:include href="entries/2017-08-03-3.xml"/>
+ <xi:include href="entries/2017-08-03-2.xml"/>
+ <xi:include href="entries/2017-08-03-1.xml"/>
+ <xi:include href="entries/2017-07-31-1.xml"/>
<xi:include href="entries/2017-07-20-1.xml"/>
<xi:include href="entries/2017-07-10-1.xml"/>
<xi:include href="entries/2017-07-07-1.xml"/>