Merge branch 'fusionax' of /home/git/platal into fusionax
authorPascal Corpet <pascal.corpet@m4x.org>
Tue, 22 Jul 2008 21:12:06 +0000 (23:12 +0200)
committerPascal Corpet <pascal.corpet@m4x.org>
Tue, 22 Jul 2008 21:12:06 +0000 (23:12 +0200)
commit31821494a692c035262a32493aef6cb3e1f61579
tree7a71ec3dc2e1db6d1c093b6b3c427e9ca4c74a89
parent7f12e3b4113791f3372f11572a205925d7bb6b97
parent6ea6d9c1f50a5ad75aa86d8c14089975eb988534
Merge branch 'fusionax' of /home/git/platal into fusionax
include/notifs.inc.php
include/user.func.inc.php
include/userset.inc.php
modules/email.php
modules/profile/general.inc.php
modules/profile/jobs.inc.php
templates/include/minifiche.tpl
templates/profile/profile.tpl