Commit:    f65d2c63134023b3ffaac2c7e46fa5c0224c072f
Author:    Eli White <e...@eliw.com>         Thu, 6 Jul 2017 16:21:59 -0400
Parents:   b79fb86f0a57add32388fc7197952eb4537d16fb 
ef792dbe2bd0c44c6ea153afdf56651df5b7c314
Branches:  master

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

Log:
Merged in PR #164 and fixed the merge conflict

Bugs:
https://bugs.php.net/164

Changed paths:
  MM  archive/archive.xml


Diff:
diff --cc archive/archive.xml
index aee31ea,f068334..09bba84
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,9 -9,7 +9,10 @@@
      <uri>http://php.net/contact</uri>
      <email>php-webmaster@lists.php.net</email>
    </author>
 +  <xi:include href="entries/2017-07-06-3.xml"/>
 +  <xi:include href="entries/2017-07-06-2.xml"/>
 +  <xi:include href="entries/2017-07-06-1.xml"/>
+   <xi:include href="entries/2017-06-29-1.xml"/>
    <xi:include href="entries/2017-06-23-1.xml"/>
    <xi:include href="entries/2017-06-22-1.xml"/>
    <xi:include href="entries/2017-06-17-1.xml"/>


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

Reply via email to