com web/php: Adding ConFoo Montreal - Merge branch 'pull-request/133': archive/archive.xml
| From: | Eli White | Date: | Fri, 28 Oct 2016 17:04:17 +0000 |
| Subject: | com web/php: Adding ConFoo Montreal - Merge branch 'pull-request/133': archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-25285@lists.php.net to get a copy of this message | ||
Commit: 20a4c1119ca8ab49a9db8d2d4c9b477d3038b9f1
Author: Eli White <eli@eliw.com> Fri, 28 Oct 2016 13:04:17 -0400
Parents: 578953eaedfd95e8061b7a8b420572cb2e02c93b 19ae4c7e41a91a3b6594a54169cca4db6a901c62
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=20a4c1119ca8ab49a9db8d2d4c9b477d3038b9f1
Log:
Adding ConFoo Montreal - Merge branch 'pull-request/133'
Changed paths:
MM archive/archive.xml
Diff:
diff --cc archive/archive.xml
index 45ae729,a3b4355..fd25133
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,8 -9,8 +9,9 @@@
<uri>http://php.net/contact</uri>
<email>php-webmaster@lists.php.net</email>
</author>
+ <xi:include href="entries/2016-10-28-1.xml"/>
<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"/>