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)
commit8def9eb54fa949fce13b35a4e26add2a8118e6aa
treebf7b07ce75915ec0347dd39b27a6bc9fea955a1c
parent280806d9b54e0a40cefb3c542d4ebe5af84d5d8e
parent6d33f1d395b294b3e2b189b64355e63df42147e7
Merge branch 'platal-1.0.0'
classes/user.php
configs/platal.cron.in
include/profilefields.inc.php
templates/include/minifiche.tpl
templates/profile/profile.tpl