Commit:    5078726a606378e1c8eab6733f4e43734795389f
Author:    Eli White <e...@eliw.com>         Tue, 6 Mar 2018 08:09:22 -0500
Parents:   85d86b920d2ae44c10500ebfa22523ab1e99eb7a 
e9c384ddaf5aadd0d082061fc1f9e49381e815ca
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=5078726a606378e1c8eab6733f4e43734795389f

Log:
Merging in CakeFest 2018

Changed paths:
  MM  archive/archive.xml


Diff:
diff --cc archive/archive.xml
index 533ae2e,9cf47df..88f2e04
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -13,7 -13,7 +13,8 @@@
    <xi:include href="entries/2018-03-01-3.xml"/>
    <xi:include href="entries/2018-03-01-2.xml"/>
    <xi:include href="entries/2018-03-01-1.xml"/>
+   <xi:include href="entries/2018-02-26-1.xml"/>
 +  <xi:include href="entries/2018-02-22-1.xml"/>
    <xi:include href="entries/2018-02-16-1.xml"/>
    <xi:include href="entries/2018-02-14-1.xml"/>
    <xi:include href="entries/2018-02-07-1.xml"/>


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to