Merge commit 'origin/master' into fusionax
authorStéphane Jacob <sj@m4x.org>
Sat, 7 Nov 2009 23:37:52 +0000 (00:37 +0100)
committerStéphane Jacob <sj@m4x.org>
Sat, 7 Nov 2009 23:37:52 +0000 (00:37 +0100)
commit1dc71da137a384e771723b8a893539a7f5cc9fab
tree235c9ae653f73b88e7a33256e19a927bf32a4587
parent3f5cf357e7ab02c9cbf616bc8cc3a70278af62cc
parentd4fd2f8a4478d5f8e18b2dadfbf663224d112ad1
Merge commit 'origin/master' into fusionax
29 files changed:
ChangeLog
configs/platal.cron.in
configs/platal.ini
include/notifs.inc.php
include/profil.func.inc.php
include/user.func.inc.php
include/validations.inc.php
modules/admin.php
modules/email.php
modules/newsletter.php
modules/profile.php
modules/profile/general.inc.php
modules/register.php
modules/search/classes.inc.php
templates/admin/index.tpl
templates/axletter/edit.tpl
templates/emails/redirect.tpl
templates/events/index.tpl
templates/include/minifiche.tpl
templates/newsletter/edit.tpl
templates/platal/motdepasse.success.tpl
templates/profile/groupesx.tpl
templates/profile/mentor.tpl
templates/profile/orange.tpl
templates/profile/profile.tpl
templates/profile/referent.tpl
templates/search/adv.form.tpl
templates/skin/common.menu.tpl
templates/xnetgrp/annuaire.tpl