The branch, master has been updated via e69384948a6f73edbd1b06de626590171a5d8825 (commit) from 6a3ac2affe68ab0c9a27264050aa3b731ae83f21 (commit)

- Log ----------------------------------------------------------------- commit e69384948a6f73edbd1b06de626590171a5d8825 Author: Marc Delisle marc@infomarc.info Date: Thu Mar 18 09:03:55 2010 -0400

layout problem

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

Summary of changes: templates/team.tpl | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/templates/team.tpl b/templates/team.tpl index beb36e9..b41c596 100644 --- a/templates/team.tpl +++ b/templates/team.tpl @@ -87,10 +87,14 @@ in Karlsruhe, Germany for the 10th anniversary of PHP and MySQL at the <a href="http://www.lamparea.org/">LAMP Area</a>, with some special guests. </p> +<p>The second meeting took place in Brussels, Belgium during +<a href="http://fosdem.org/2010">FOSDEM 2010</a>. Marc Delisle talked +about &quot;State of phpMyAdmin&quot; in the MySQL developer room. +</p>

<div class="screenshot"> <a href="${base_url}images/linuxtag/IMG_4187.JPG" - rel="lightbox[meeting]" title="phpMyAdmin team with Rasmus (PHP) - Marc Delisle, Olivier Müller, Alexander M. Turek, Rasmus Lerdorf, Garvin Hicking, Michal Čihař, Robin Johnson"> + rel="lightbox[meeting]" title="2005 team with Rasmus (PHP) - Marc Delisle, Olivier Müller, Alexander M. Turek, Rasmus Lerdorf, Garvin Hicking, Michal Čihař, Robin Johnson"> <img src="${base_url}images/linuxtag/IMG_4187_tn.JPG" alt="phpMyAdmin team with Rasmus (PHP)" /> </a> @@ -98,20 +102,15 @@ guests.

<div class="screenshot"> <a href="${base_url}images/linuxtag/IMG_4189.JPG" - rel="lightbox[meeting]" title="phpMyAdmin team with Monty (MySQL) - Michal Čihař, Marc Delisle, Olivier Müller, Garvin Hicking, Michael Widenius (Monty), Alexander M. Turek, Robin Johnson"> + rel="lightbox[meeting]" title="2005 team with Monty (MySQL) - Michal Čihař, Marc Delisle, Olivier Müller, Garvin Hicking, Michael Widenius (Monty), Alexander M. Turek, Robin Johnson"> <img src="${base_url}images/linuxtag/IMG_4189_tn.JPG" alt="phpMyAdmin team with Rasmus (PHP)" /> </a> </div>

-<p>The second meeting took place in Brussels, Belgium during -<a href="http://fosdem.org/2010">FOSDEM 2010</a>. Marc Delisle talked -about &quot;State of phpMyAdmin&quot; in the MySQL developer room. -</p> - <div class="screenshot"> <a href="${base_url}images/fosdem-2010/fosdem-2010-med.jpg" - rel="lightbox[meeting]" title="During lunch break - Marc Delisle, Robin H. Johnson, Herman van Rink, Michal Čihař, Alexander M. Turek"> + rel="lightbox[meeting]" title="2010 team - Marc Delisle, Robin H. Johnson, Herman van Rink, Michal Čihař, Alexander M. Turek"> <img src="${base_url}images/fosdem-2010/fosdem-2010-tn.jpg" alt="phpMyAdmin team at FOSDEM 2010" /> </a>

hooks/post-receive