projects / platal.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 21d2cba 01a5b33)
Merge commit 'origin/master' into hruid.
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Fri, 27 Jun 2008 21:16:19 +0000 (23:16 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Fri, 27 Jun 2008 21:16:19 +0000 (23:16 +0200)
commitb8971a3ed64f3ba69becf1cd8f3b32ee2292026d
treee22072ce291f013accfeae25c117713bc6791c8ctree | snapshot
parent21d2cba66c9ee81e2bbb9acbd83564de248f8e46commit | diff
parent01a5b3330f7896c20bbb630aaf13742da54a877bcommit | diff
Merge commit 'origin/master' into hruid.
Branch hruid is now broken -- will be repaired shortly.

Conflicts:

classes/session.php
classes/xnetsession.php
include/user.func.inc.php
include/xorg/session.inc.php
modules/profile.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
16 files changed:
include/banana/forum.inc.php diff1 | diff2 | blob | history
include/banana/hooks.inc.php diff1 | diff2 | blob | history
include/banana/moderate.inc.php diff1 | diff2 | blob | history
include/user.func.inc.php diff1 | diff2 | blob | history
include/validations/nomusage.inc.php diff1 | diff2 | blob | history
include/vcard.inc.php diff1 | diff2 | blob | history
modules/admin.php diff1 | diff2 | blob | history
modules/carnet.php diff1 | diff2 | blob | history
modules/forums.php diff1 | diff2 | blob | history
modules/googleapps.php diff1 | diff2 | blob | history
modules/lists.php diff1 | diff2 | blob | history
modules/marketing.php diff1 | diff2 | blob | history
modules/platal.php diff1 | diff2 | blob | history
modules/profile.php diff1 | diff2 | blob | history
modules/register.php diff1 | diff2 | blob | history
modules/xnetgrp.php diff1 | diff2 | blob | history
plat/al