com web/php: Merge branch 'pull-request/226': archive/archive.xml
| From: | JulienPauli | Date: | Mon, 25 Jun 2018 11:00:23 +0000 |
| Subject: | com web/php: Merge branch 'pull-request/226': archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-27077@lists.php.net to get a copy of this message | ||
Commit: 3e3c5f15bd91a0298afd555b693b49f87b316e84
Author: Julien Pauli <jpauli@php.net> Mon, 25 Jun 2018 13:00:23 +0200
Parents: ccd8b0d2a937db3f1bd28c0d909a45b0f3742ac4 0eeddb653eb02e47b8a4737f4a84025e32f60bc4
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=3e3c5f15bd91a0298afd555b693b49f87b316e84
Log:
Merge branch 'pull-request/226'
Changed paths:
MM archive/archive..xml
Diff:
diff --cc archive/archive.xml
index 7ee3650,370d570...7f781f9
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,9 -9,9 +9,10 @@@
<uri>http://php.net/contact</uri>
<email>php-webmaster@lists.php.net</email>
</author>
+ <xi:include href="entries/2018-06-25-1.xml"/>
<xi:include href="entries/2018-06-21-2..xml"/>
<xi:include href="entries/2018-06-21-1.xml"/>
+ <xi:include href="entries/2018-06-18-1.xml"/>
<xi:include href="entries/2018-06-13-1.xml"/>
<xi:include href="entries/2018-06-11-1.xml"/>
<xi:include href="entries/2018-06-07-1.xml"/>