com web/php: Merge remote-tracking branch 'upstream/master': archive/archive.xml
| From: | Eli White | Date: | Wed, 20 Dec 2017 00:42:36 +0000 |
| Subject: | com web/php: Merge remote-tracking branch 'upstream/master': archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-26727@lists.php.net to get a copy of this message | ||
Commit: 42ce24880e790e3789a3ff1c3436edc2a597f856
Author: Daniel Abernathy <dabernathy89@gmail.com> Tue, 19 Dec 2017 18:42:36 -0600
Parents: e813d457c0de8280f38a9e8926158b8721125562 86580c9a4be551588ae77de1e51a81c247bfebca
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=42ce24880e790e3789a3ff1c3436edc2a597f856
Log:
Merge remote-tracking branch 'upstream/master'
Changed paths:
MM archive/archive.xml
Diff:
diff --cc archive/archive.xml
index 624f74d,b2f6d4b..55e72c2
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,11 +9,12 @@@
<uri>http://php.net/contact</uri>
<email>php-webmaster@lists.php.net</email>
</author>
+ <xi:include href="entries/2017-11-30-1.xml"/>
+ <xi:include href="entries/2017-11-24-1.xml"/>
+ <xi:include href="entries/2017-11-23-1.xml"/>
+ <xi:include href="entries/2017-11-22-1.xml"/>
+ <xi:include href="entries/2017-11-20-1.xml"/>
+ <xi:include href="entries/2017-11-16-1.xml"/>
<xi:include href="entries/2017-11-09-1.xml"/>
<xi:include href="entries/2017-11-08-1.xml"/>
<xi:include href="entries/2017-11-06-1.xml"/>