git.polytechnique.org Git - platal.git/commit

projects / platal.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 52e5a81 06df222)

author	Florent Bruneau <florent.bruneau@polytechnique.org>
	Sat, 19 Jul 2008 14:02:32 +0000 (16:02 +0200)
committer	Florent Bruneau <florent.bruneau@polytechnique.org>
	Sat, 19 Jul 2008 14:02:32 +0000 (16:02 +0200)
commit	63f06a435ff8e9c058b1dee1eb97fff99606d490
tree	cc86b459c11cb48654bd054f862e1bd00fbf749f	tree \| snapshot
parent	52e5a81679cde60a6609e893352b6dface9e1e08	commit \| diff
parent	06df222b7962dd5b71b34ec1dd078276d7327dbc	commit \| diff

Merge branch 'platal-0.9.17'

Conflicts:

classes/plset.php
include/user.func.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

12 files changed:

include/userset.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations.inc.php	diff1 \|	diff2 \|	blob \| history
modules/admin.php	diff1 \|	diff2 \|	blob \| history
modules/axletter.php	diff1 \|	diff2 \|	blob \| history
modules/carnet.php	diff1 \|	diff2 \|	blob \| history
modules/email.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/register/register.inc.php	diff1 \|	diff2 \|	blob \| history
modules/search.php	diff1 \|	diff2 \|	blob \| history
modules/xnetgrp.php	diff1 \|	diff2 \|	blob \| history

plat/al