Commit:    48ba84f1b006842f4d692d3306fd9a2be4c3a888
Author:    Eli White <[email protected]>         Tue, 6 Feb 2018 16:17:07 -0500
Parents:   58ba4f82631a9121729d98c572a2ef6798e0425c 
3ff169f3e2a9537655f036f724b9cc27768a2377
Branches:  master

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

Log:
Merging in phpexperience

Changed paths:
  MM  archive/archive.xml
  AA  archive/entries/2018-02-01-3.xml


Diff:
diff --cc archive/archive.xml
index ab3a213,b04568e..59ce286
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@@ -9,11 -9,8 +9,12 @@@
      <uri>http://php.net/contact</uri>
      <email>[email protected]</email>
    </author>
++  <xi:include href="entries/2018-02-01-3.xml"/>
 +  <xi:include href="entries/2018-02-01-2.xml"/>
    <xi:include href="entries/2018-02-01-1.xml"/>
    <xi:include href="entries/2018-01-31-1.xml"/>
 +  <xi:include href="entries/2018-01-09-2.xml"/>
 +  <xi:include href="entries/2018-01-09-1.xml"/>
    <xi:include href="entries/2018-01-04-4.xml"/>
    <xi:include href="entries/2018-01-04-3.xml"/>
    <xi:include href="entries/2018-01-04-2.xml"/>
diff --cc archive/entries/2018-02-01-3.xml
index 0000000,0000000..342e129
new file mode 100644
--- /dev/null
+++ b/archive/entries/2018-02-01-3.xml
@@@ -1,0 -1,0 +1,21 @@@
++<?xml version="1.0" encoding="utf-8"?>
++<entry xmlns="http://www.w3.org/2005/Atom"; 
xmlns:default="http://php.net/ns/news";>
++  <title>PHP Experience 2018</title>
++  <id>http://php.net/archive/2018.php#id2018-02-01-3</id>
++  <published>2018-02-01T10:20:29-02:00</published>
++  <updated>2018-02-01T10:20:29-02:00</updated>
++  <default:finalTeaserDate 
xmlns="http://php.net/ns/news";>2018-03-05</default:finalTeaserDate>
++  <category term="conferences" label="Conference announcement"/>
++  <link href="http://php.net/conferences/index.php#id2018-02-01-3"; 
rel="alternate" type="text/html"/>
++  <default:newsImage xmlns="http://php.net/ns/news"; 
link="https://eventos.imasters.com.br/phpexperience/"; title="PHP Experience 
2018">phpx-2018-logo-1.png</default:newsImage>
++  <link href="https://eventos.imasters.com.br/phpexperience/"; rel="via" 
type="text/html"/>
++  <content type="xhtml">
++    <div xmlns="http://www.w3.org/1999/xhtml";>
++      <p>With big names from PHP community, the sixth edition of PHP 
Experience brings together about 1200 PHP developers in São Paulo/SP - Brazil 
from March 05 to 06, 2018.</p>
++      <p>In two days of content we will have: international keynotes, three 
tracks, in addition to several actions to exchange experiences and 
networking.</p>
++      <p>Check out the programming at 
https://eventos.imasters.com.br/phpexperience/#secao-atracoes </p>
++      <p>Check out the confirmed speakers at 
https://eventos.imasters.com.br/phpexperience/#secao-texto</p>
++        <p>Subscriptions at 
https://eventos.imasters.com.br/phpexperience/#secao-inscricao</p>
++    </div>
++  </content>
++</entry>


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

Reply via email to