com web/php: Merge branch 'master' into phpconference: archive/archive.xml
| From: | Eli White | Date: | Thu, 20 Apr 2017 13:19:49 +0000 |
| Subject: | com web/php: Merge branch 'master' into phpconference: archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-25800@lists.php.net to get a copy of this message | ||
Commit: bea6af658cd5209f10e718ffa666ff2e333f97b4
Author: Piet de Nooijer <piet@ibuildings.nl> Thu, 20 Apr 2017 15:19:49 +0200
Committer: GitHub <noreply@github.com> Thu, 20 Apr 2017 15:19:49 +0200
Parents: 746c0b866af72fe888f4ba20e85cd3239afe11d0 4dafd89cfb0645bc7d9900dbe737960036b51c50
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=bea6af658cd5209f10e718ffa666ff2e333f97b4
Log:
Merge branch 'master' into phpconference
Changed paths:
MM archive/archive.xml
Diff:
diff --cc archive/archive.xml
index 01cba97,f99cd84..f1a5740
--- 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-04-14-1.xml"/>
+ <xi:include href="entries/2017-04-13-3.xml"/>
<xi:include href="entries/2017-04-13-2.xml"/>
<xi:include href="entries/2017-04-13-1.xml"/>
<xi:include href="entries/2017-03-30-2.xml"/>