Commit: f5da09372457b841b6f2bffd0379c409ae9794fa Author: Adam Culp <[email protected]> Tue, 26 Jun 2018 17:46:15 -0400 Parents: 974234438e9919dbec3be01c2efc9f099fecd16d d35b021dca482e4532229361cfb2bd884861920c Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=f5da09372457b841b6f2bffd0379c409ae9794fa Log: Merge branch 'master' of https://github.com/php/web-php # Conflicts: # archive/archive.xml Changed paths: MM archive/archive.xml Diff: diff --cc archive/archive.xml index 69b4587,70569bf..6defdbf --- a/archive/archive.xml +++ b/archive/archive.xml @@@ -9,7 -9,9 +9,10 @@@ <uri>http://php.net/contact</uri> <email>[email protected]</email> </author> + <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
