projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e35e81 77c5588)
Merge branch 'platal-0.9.16'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 25 May 2008 12:47:54 +0000 (14:47 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 25 May 2008 12:47:54 +0000 (14:47 +0200)
Conflicts:

modules/auth/auth.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
1  2 
modules/email.php patch | diff1 | diff2 | blob | history

diff --cc modules/email.php
Simple merge
plat/al