Commit:    f7d90b76d140d0fd14b4afe55844d5f7ff4ac273
Author:    Eli White <e...@eliw.com>         Wed, 16 Aug 2017 13:38:51 -0400
Parents:   b94c2576a432b9fdfe793b2ff9733ea3662649ae 
e124399cce9a57457c4bc154f575848c216b60a2
Branches:  master

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

Log:
Merging SunshinePHP + merge fix

Changed paths:
  MM  archive/archive.xml


Diff:
diff --cc archive/archive.xml
index d6a6d68,f46ba72..320f736
--- 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-08-16-1.xml"/>
 +  <xi:include href="entries/2017-08-13-1.xml"/>
    <xi:include href="entries/2017-08-03-3.xml"/>
    <xi:include href="entries/2017-08-03-2.xml"/>
    <xi:include href="entries/2017-08-03-1.xml"/>


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

Reply via email to