Merge commit 'origin/fusionax' into account
authorStéphane Jacob <sj@m4x.org>
Fri, 13 Nov 2009 22:36:17 +0000 (23:36 +0100)
committerStéphane Jacob <sj@m4x.org>
Fri, 13 Nov 2009 22:36:17 +0000 (23:36 +0100)
commit5660032ac785d410f90e3f5b0d6948dc90b0cfea
tree2f4148c042b6217fc32b16f8dcf79f261b2ff797
parente46cf8c46341b447cc3701c8afcc9baec3da11e5
parentee71865181e96e7b0754ef9e7da4b3cb26f4c1d7
Merge commit 'origin/fusionax' into account
37 files changed:
Makefile
classes/platalglobals.php.in
classes/platallogger.php
classes/xnetpage.php
classes/xnetsession.php
classes/xorgsession.php
configs/platal.ini
htdocs/javascript/.gitignore
include/banana/forum.inc.php
include/banana/hooks.inc.php
include/user.func.inc.php
include/validations/listes.inc.php
modules/admin.php
modules/auth.php
modules/auth/auth.inc.php
modules/carnet.php
modules/email.php
modules/events.php
modules/lists.php
modules/newsletter.php
modules/payment.php
modules/platal.php
modules/profile.php
modules/profile/groups.inc.php
modules/search.php
modules/stats.php
modules/survey/survey.inc.php
modules/xnetevents.php
modules/xnetevents/xnetevents.inc.php
modules/xnetgrp.php
modules/xnetgrp/feed.inc.php
modules/xnetlists.php
templates/admin/deces_promo.tpl
templates/carnet/mescontacts.tpl
templates/emails/send.tpl
templates/xnet/skin.tpl
templates/xnetevents/edit.tpl