com web/php: Merge remote-tracking branch 'upstream/master' into phpdetroit: archive/archive.xml
| From: | Eli White | Date: | Fri, 02 Mar 2018 13:17:35 +0000 |
| Subject: | com web/php: Merge remote-tracking branch 'upstream/master' into phpdetroit: archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-26810@lists.php.net to get a copy of this message | ||
Commit: efb38efd38a681d124be814652ee517ced496acf
Author: Frank Laszlo <flaszlo@nexcess.net> Fri, 2 Mar 2018 08:17:35 -0500
Parents: 05e75ccff932195b80ea0066434732bed6a98f77 ffa80544cff0afd64267549906c75a7b76567aca
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=efb38efd38a681d124be814652ee517ced496acf
Log:
Merge remote-tracking branch 'upstream/master' into phpdetroit
Changed paths:
MM archive/archive.xml
Diff:
diff --cc archive/archive.xml
index a478d3d,004c2df..9cdc198
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,8 -9,9 +9,11 @@@
<uri>http://php.net/contact</uri>
<email>php-webmaster@lists.php.net</email>
</author>
+ <xi:include href="entries/2018-03-02-1.xml"/>
+ <xi:include href="entries/2018-03-01-5.xml"/>
+ <xi:include href="entries/2018-03-01-4.xml"/>
+ <xi:include href="entries/2018-03-01-3.xml"/>
+ <xi:include href="entries/2018-03-01-2.xml"/>
<xi:include href="entries/2018-03-01-1.xml"/>
<xi:include href="entries/2018-02-16-1.xml"/>
<xi:include href="entries/2018-02-14-1.xml"/>