Commit: 4a8fc0430911e877837b36421d07ab24e9b653f9 Author: Eli White <e...@eliw.com> Wed, 8 Nov 2017 10:44:25 -0500 Parents: 105f982666118b78e017e9dd22169f4910b8d832 0aa270a29d6a2ce3b91915ec25ae321869f3bcc0 Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=4a8fc0430911e877837b36421d07ab24e9b653f9 Log: Fixing merge Changed paths: MM archive/archive.xml Diff: diff --cc archive/archive.xml index 996dee5,e77322d..12cfeaa --- 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/2017-11-08-1.xml"/> + <xi:include href="entries/2017-11-06-1.xml"/> <xi:include href="entries/2017-10-27-1.xml"/> <xi:include href="entries/2017-10-26-3.xml"/> <xi:include href="entries/2017-10-26-2.xml"/> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
