Merge commit 'origin/fusionax' into account
authorStéphane Jacob <sj@m4x.org>
Tue, 21 Jul 2009 13:49:45 +0000 (15:49 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 21 Jul 2009 13:49:45 +0000 (15:49 +0200)
commitd1e6167749fdad08c81e23d09e1bbbf76e3b989b
tree21c9ccd18dd1ffa1fb9b7458b99e5851814a5007
parent2ff7e02074cc480b34c355ccbe11f91b65e5ce2b
parent5f2bea23bffceb362acdd1a6e0f140b68f4df450
Merge commit 'origin/fusionax' into account
47 files changed:
Makefile
classes/user.php
classes/xnetpage.php
classes/xorgsession.php
include/banana/forum.inc.php
include/banana/hooks.inc.php
include/banana/ml.inc.php
include/emails.inc.php
include/googleapps.inc.php
include/vcard.inc.php
modules/admin.php
modules/auth.php
modules/auth/auth.inc.php
modules/axletter.php
modules/axletter/axletter.inc.php
modules/carnet.php
modules/email.php
modules/events.php
modules/forums.php
modules/gadgets.php
modules/googleapps.php
modules/lists.php
modules/newsletter.php
modules/payment.php
modules/platal.php
modules/profile.php
modules/profile/addresses.inc.php
modules/profile/general.inc.php
modules/profile/jobs.inc.php
modules/profile/page.inc.php
modules/register.php
modules/register/register.inc.php
modules/search.php
modules/stats.php
modules/xnetgrp.php
modules/xnetlists.php
templates/admin/deces_promo.tpl
templates/admin/utilisateurs.tpl
templates/core/password_prompt.tpl
templates/emails/broken.tpl
templates/events/index.tpl
templates/include/minifiche.tpl
templates/payment/xnet.tpl
templates/xnetevents/edit.tpl
templates/xnetgrp/annuaire.tpl
templates/xnetgrp/edit.tpl
templates/xnetgrp/membres-add.tpl