Commit:    1aa083a325a76094f2d033388d58adbf9d31d3d1
Author:    Eli White <[email protected]>         Wed, 27 May 2015 23:43:08 -0400
Parents:   8bfa8b8fae3d877b3bdcbf27579b28882b62b056
Branches:  master

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

Log:
Adding in PHPCON China

Per request from mailing list

Changed paths:
  M  archive/archive.xml
  A  archive/entries/2015-05-27-1.xml
  A  images/news/2015.conchina.jpg


Diff:
diff --git a/archive/archive.xml b/archive/archive.xml
index 7fda6bc..3faf9f7 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
     <uri>http://php.net/contact</uri>
     <email>[email protected]</email>
   </author>
+  <xi:include href="entries/2015-05-27-1.xml"/>
   <xi:include href="entries/2015-05-25-1.xml"/>
   <xi:include href="entries/2015-05-14-3.xml"/>
   <xi:include href="entries/2015-05-14-2.xml"/>
diff --git a/archive/entries/2015-05-27-1.xml b/archive/entries/2015-05-27-1.xml
new file mode 100644
index 0000000..6734823
--- /dev/null
+++ b/archive/entries/2015-05-27-1.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom"; 
xmlns:default="http://php.net/ns/news";>
+  <title>China PHP Conference 2015</title>
+  <id>http://php.net/archive/2015.php#id2015-05-27-1</id>
+  <published>2015-05-27T23:36:31-04:00</published>
+  <updated>2015-05-27T23:36:31-04:00</updated>
+  <default:finalTeaserDate 
xmlns="http://php.net/ns/news";>2015-06-06</default:finalTeaserDate>
+  <category term="conferences" label="Conference announcement"/>
+  <link href="http://php.net/conferences/index.php#id2015-05-27-1"; 
rel="alternate" type="text/html"/>
+  <default:newsImage xmlns="http://php.net/ns/news"; 
link="http://www.phpconchina.com/"; title="PHPCON 
China">2015.conchina.jpg</default:newsImage>
+  <link href="http://www.phpconchina.com/"; rel="via" type="text/html"/>
+  <content type="xhtml">
+    <div xmlns="http://www.w3.org/1999/xhtml";>
+     <p>China PHP Conference 2015</p>
+     
+     <p>3rd Annual China PHP Conference – June 6 to 7, Beijing  and July 11 to 
12, Shanghai</p>
+     
+     <p>2015, ThinkInLAMP is excited to present two PHP Conferences in both 
Beijing and Shanghai, China.</p>
+     
+     <p>We will be hosting a 2-days event filled with high quality, technical 
sessions about PHP Core, PHP High Performance, PHP Engineering, and PHP more. 
During this session you will hear from Laruence Hui and his "PHP 7 is coming!" 
and an exclusive Q&amp;A with him.</p>
+     
+     <p>Don’t miss out on 2-great days sessions, delicious food, fantastic 
shows and countless networking opportunities to engage with speakers and 
delegates. For tickets and more information: <a 
href="http://www.phpconchina.com";>www.phpconchina.com</a></p>
+     
+    </div>
+  </content>
+</entry>
diff --git a/images/news/2015.conchina.jpg b/images/news/2015.conchina.jpg
new file mode 100644
index 0000000..531e974
Binary files /dev/null and b/images/news/2015.conchina.jpg differ


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

Reply via email to