[PHP-WEBMASTER] com web/php: Merged pr/160, also cleaned up conflicts in archive.xml and resized the image to be within a reasonable size.: archive/archive.xml images/news/laravelConfTaiwan_2017.png

[Eli White]

Commit:    31770728d7a7daf719a4589bcea5a6012ac52501
Author:    Eli White <e...@eliw.com>         Tue, 20 Jun 2017 11:49:52 -0400
Parents:   68332d0ed159d9902f97c16da22450721bd939e9 
5f5333a05996624abb0850b44186c67284a05085
Branches:  master

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

Log:
Merged pr/160, also cleaned up conflicts in archive.xml and resized the image 
to be within a reasonable size.

Changed paths:
  MM  archive/archive.xml
  AM  images/news/laravelConfTaiwan_2017.png


Diff:
diff --cc archive/archive.xml
index 3128a67,9ee6230..30692d8
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,8 -9,7 +9,9 @@@
      <uri>http://php.net/contact</uri>
      <email>php-webmaster@lists.php.net</email>
    </author>
+   <xi:include href="entries/2017-06-17-1.xml"/>
 +  <xi:include href="entries/2017-06-14-1.xml"/>
 +  <xi:include href="entries/2017-06-09-1.xml"/>
    <xi:include href="entries/2017-06-08-3.xml"/>
    <xi:include href="entries/2017-06-08-2.xml"/>
    <xi:include href="entries/2017-06-08-1.xml"/>
diff --cc images/news/laravelConfTaiwan_2017.png
index 0000000,af963d9..4e15d30
mode 000000,100644..100644
Binary files differ


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