com web/php: Merge branch 'master' into master: archive/archive.xml
| From: | Eli White | Date: | Mon, 05 Mar 2018 07:45:46 +0000 |
| Subject: | com web/php: Merge branch 'master' into master: archive/archive.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-26805@lists.php.net to get a copy of this message | ||
Commit: e9c384ddaf5aadd0d082061fc1f9e49381e815ca
Author: Walther Lalk <83255+dakota@users.noreply.github.com> Mon, 5 Mar 2018
09:45:46 +0200
Committer: GitHub <noreply@github.com> Mon, 5 Mar 2018 09:45:46 +0200
Parents: f44ea76a748df7a4b5d37e8f44755fa6bcb616a9 ffa80544cff0afd64267549906c75a7b76567aca
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=e9c384ddaf5aadd0d082061fc1f9e49381e815ca
Log:
Merge branch 'master' into master
Changed paths:
MM archive/archive.xml
Diff:
diff --cc archive/archive.xml
index 475915a,004c2df..9cf47df
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,7 -9,10 +9,11 @@@
<uri>http://php.net/contact</uri>
<email>php-webmaster@lists.php.net</email>
</author>
+ <xi:include href="entries/2018-03-02-1.xml"/>
+ <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-16-1.xml"/>
<xi:include href="entries/2018-02-14-1.xml"/>
<xi:include href="entries/2018-02-07-1.xml"/>