Commit: bea6af658cd5209f10e718ffa666ff2e333f97b4 Author: Piet de Nooijer <[email protected]> Thu, 20 Apr 2017 15:19:49 +0200 Committer: GitHub <[email protected]> Thu, 20 Apr 2017 15:19:49 +0200 Parents: 746c0b866af72fe888f4ba20e85cd3239afe11d0 4dafd89cfb0645bc7d9900dbe737960036b51c50 Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=bea6af658cd5209f10e718ffa666ff2e333f97b4 Log: Merge branch 'master' into phpconference Changed paths: MM archive/archive.xml Diff: diff --cc archive/archive.xml index 01cba97,f99cd84..f1a5740 --- a/archive/archive.xml +++ b/archive/archive.xml @@@ -9,7 -9,7 +9,8 @@@ <uri>http://php.net/contact</uri> <email>[email protected]</email> </author> + <xi:include href="entries/2017-04-14-1.xml"/> + <xi:include href="entries/2017-04-13-3.xml"/> <xi:include href="entries/2017-04-13-2.xml"/> <xi:include href="entries/2017-04-13-1.xml"/> <xi:include href="entries/2017-03-30-2.xml"/> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
