Merge branch 'platal-1.0.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 13 Jul 2010 13:04:34 +0000 (15:04 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 13 Jul 2010 13:04:34 +0000 (15:04 +0200)
1  2 
classes/user.php
configs/platal.cron.in
include/profilefields.inc.php
templates/include/minifiche.tpl
templates/profile/profile.tpl

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge