Commit: 24056934c0fdd007224c3ef35226436c0beae68f Author: Adam Culp <[email protected]> Tue, 26 Jun 2018 17:46:52 -0400 Parents: f5da09372457b841b6f2bffd0379c409ae9794fa Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=24056934c0fdd007224c3ef35226436c0beae68f Log: Merge branch 'master' of https://github.com/php/web-php # Conflicts: # archive/archive.xml Changed paths: M archive/archive.xml Diff: diff --git a/archive/archive.xml b/archive/archive.xml index 6defdbf..767d183 100644 --- a/archive/archive.xml +++ b/archive/archive.xml @@ -9,10 +9,10 @@ <uri>http://php.net/contact</uri> <email>[email protected]</email> </author> + <xi:include href="entries/2018-06-26-1.xml"/> <xi:include href="entries/2018-06-25-4.xml"/> <xi:include href="entries/2018-06-25-3.xml"/> <xi:include href="entries/2018-06-25-2.xml"/> - <xi:include href="entries/2018-06-26-1.xml"/> <xi:include href="entries/2018-06-25-1.xml"/> <xi:include href="entries/2018-06-21-2.xml"/> <xi:include href="entries/2018-06-21-1.xml"/> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
