Commit:    319df095090f0633f8f202237eebfb079bfa1eeb
Author:    Jeremy Coates <[email protected]>         Tue, 
5 Sep 2017 16:14:26 +0100
Committer: GitHub <[email protected]>      Tue, 5 Sep 2017 16:14:26 +0100
Parents:   f6276b318957773a448324358b0d3a7be528c2df 
841da498730fd7915812d12186f40a91bb9bf1ec
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=319df095090f0633f8f202237eebfb079bfa1eeb

Log:
Merge branch 'master' into master

Changed paths:
  MM  archive/archive.xml


Diff:
diff --cc archive/archive.xml
index 95b8877,aa14db5..79db45f
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,9 +9,10 @@@
      <uri>http://php.net/contact</uri>
      <email>[email protected]</email>
    </author>
+   <xi:include href="entries/2017-09-01-1.xml"/>
+   <xi:include href="entries/2017-08-31-1.xml"/>
+   <xi:include href="entries/2017-08-31-2.xml"/>
 +  <xi:include href="entries/2017-08-30-1.xml"/>
    <xi:include href="entries/2017-08-17-1.xml"/>
    <xi:include href="entries/2017-08-16-1.xml"/>
    <xi:include href="entries/2017-08-13-1.xml"/>


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to