The branch, master has been updated
       via  d19571307fd6f20f1a9e908990050aa05d4cabdb (commit)
      from  34489a217cf5b4b79300b57b5f5d08d7c3ef2498 (commit)


- Log -----------------------------------------------------------------
commit d19571307fd6f20f1a9e908990050aa05d4cabdb
Author: Marc Delisle <[email protected]>
Date:   Mon Dec 13 10:04:03 2010 -0500

    Update team list and photos

-----------------------------------------------------------------------

Summary of changes:
 images/heads/dieter.jpg |  Bin 0 -> 2242 bytes
 images/heads/marc.jpg   |  Bin 0 -> 7999 bytes
 images/heads/marc.png   |  Bin 7456 -> 0 bytes
 templates/team.tpl      |   15 ++++++++++++++-
 4 files changed, 14 insertions(+), 1 deletions(-)
 create mode 100644 images/heads/dieter.jpg
 create mode 100644 images/heads/marc.jpg
 delete mode 100644 images/heads/marc.png

diff --git a/images/heads/dieter.jpg b/images/heads/dieter.jpg
new file mode 100644
index 0000000..9570e37
Binary files /dev/null and b/images/heads/dieter.jpg differ
diff --git a/images/heads/marc.jpg b/images/heads/marc.jpg
new file mode 100644
index 0000000..d4f3fce
Binary files /dev/null and b/images/heads/marc.jpg differ
diff --git a/images/heads/marc.png b/images/heads/marc.png
deleted file mode 100644
index e7e496a..0000000
Binary files a/images/heads/marc.png and /dev/null differ
diff --git a/templates/team.tpl b/templates/team.tpl
index 8a724a0..1f65b02 100644
--- a/templates/team.tpl
+++ b/templates/team.tpl
@@ -25,7 +25,7 @@ You can follow developers blogs at
 
 <h3 class="fn">Marc Delisle</h3>
 
-<img class="head photo" src="${server}${base_url}images/heads/marc.png" 
alt="Photo of Marc Delisle" />
+<img class="head photo" src="${server}${base_url}images/heads/marc.jpg" 
alt="Photo of Marc Delisle" />
 <p>
 Marc took over the <span class="org">phpMyAdmin</span> project from founder 
Tobias Ratschiller and
 started a new era of phpMyAdmin together with Olivier Müller and Loïc Chapeaux
@@ -62,6 +62,19 @@ He lives in <span class="adr"><span 
class="locality">Groningen</span>, <span cla
 </p>
 </div>
 
+<div class="floatbox vcard" id="dieter">
+<h3 class="fn">Dieter Adriaenssens</h3>
+
+<img class="head photo" src="${server}${base_url}images/heads/dieter.jpg" 
alt="Photo of Dieter Adriaenssens" />
+<p>
+Dieter joined the development team in March 2010, and so far has
+contributed to the project by submitting bug fixes.
+</p>
+<p>
+He currently lives in <span class="adr"><span class="locality">Gent</span>, 
<span class="country-name">Belgium</span></span>.
+</p>
+</div>
+
 <div class="clearer"></div>
 
 <h2>Team meetings</h2>


hooks/post-receive
-- 
phpMyAdmin website

------------------------------------------------------------------------------
Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL,
new data types, scalar functions, improved concurrency, built-in packages, 
OCI, SQL*Plus, data movement tools, best practices and more.
http://p.sf.net/sfu/oracle-sfdev2dev 
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to