Commit: 73241d21cce05cbc5e595aa87b8bb95b284a6ce2 Author: Eli White <e...@eliw.com> Tue, 30 May 2017 12:12:19 -0400 Parents: e21cb6a6f084a8efaa0b59b6efae55bd7f442054 cea68b66ed47222ef88ea1e201d5ef470ba6d5fe Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=73241d21cce05cbc5e595aa87b8bb95b284a6ce2 Log: Merged in IPC and fixed conflicts Changed paths: MM archive/archive.xml Diff: diff --cc archive/archive.xml index 2312bad,e7b773b..3605c18 --- a/archive/archive.xml +++ b/archive/archive.xml @@@ -9,11 -9,7 +9,12 @@@ <uri>http://php.net/contact</uri> <email>php-webmaster@lists.php.net</email> </author> + <xi:include href="entries/2017-05-22-1.xml"/> + <xi:include href="entries/2017-05-18-1.xml"/> + <xi:include href="entries/2017-05-16-1.xml"/> + <xi:include href="entries/2017-05-11-2.xml"/> + <xi:include href="entries/2017-05-11-1.xml"/> + <xi:include href="entries/2017-05-09-1.xml"/> <xi:include href="entries/2017-04-14-1.xml"/> <xi:include href="entries/2017-04-13-3.xml"/> <xi:include href="entries/2017-04-13-2.xml"/> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
