Commit:    578953eaedfd95e8061b7a8b420572cb2e02c93b
Author:    David Lima <[email protected]>         Thu, 27 Oct 2016 12:20:26 
-0200
Parents:   f27f392a421b25a923125d08dc63c0b0cfb10989 
26bc7257f7e021c78f1ae4a2c2d810d1a1b26a68
Branches:  master

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

Log:
Merge branch 'master' into phpconfbrasil2016

Changed paths:
  MM  archive/archive.xml


Diff:
diff --cc archive/archive.xml
index fcc5cb0,f5cfe2d..45ae729
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,7 +9,8 @@@
      <uri>http://php.net/contact</uri>
      <email>[email protected]</email>
    </author>
+   <xi:include href="entries/2016-10-27-1.xml"/>
 +  <xi:include href="entries/2016-10-26-1.xml"/>
    <xi:include href="entries/2016-10-19-1.xml"/>
    <xi:include href="entries/2016-10-18-1.xml"/>
    <xi:include href="entries/2016-10-14-1.xml"/>


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

Reply via email to