com web/php: Merge branch 'master' into phpconfbrasil2016: archive/archive.xml
| From: | Eli White | Date: | Thu, 27 Oct 2016 14:20:26 +0000 |
| Subject: | com web/php: Merge branch 'master' into phpconfbrasil2016: archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-25283@lists.php.net to get a copy of this message | ||
Commit: 578953eaedfd95e8061b7a8b420572cb2e02c93b
Author: David Lima <dave.lima@live.com> 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>php-webmaster@lists.php.net</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"/>