Commit: 03b60c32c2ef04d3947683e64c9560a17ddeac62 Author: Eli White <[email protected]> Tue, 14 Mar 2017 22:04:59 -0400 Parents: 421224fc94ec3e0bf3c0da8c1405e2fa447e3ea7 267b5a501be4022e72f2b5ec4feb496885e46261 Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=03b60c32c2ef04d3947683e64c9560a17ddeac62 Log: Took the ZendCon CfP Announcement and fixed the merge conflict caused by Eli not merging commits quick enough. (Sorry, didn't realize that some commits were lingering until someone poked me) Changed paths: MM archive/archive.xml Diff: diff --cc archive/archive.xml index 0613b8e,4834c65..d1a7ef9 --- a/archive/archive.xml +++ b/archive/archive.xml @@@ -9,8 -9,7 +9,9 @@@ <uri>http://php.net/contact</uri> <email>[email protected]</email> </author> + <xi:include href="entries/2017-03-14-1.xml"/> + <xi:include href="entries/2017-03-04-1.xml"/> + <xi:include href="entries/2017-03-03-1.xml"/> <xi:include href="entries/2017-02-24-1.xml"/> <xi:include href="entries/2017-02-21-1.xml"/> <xi:include href="entries/2017-02-17-1.xml"/> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
