projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f088274 3661180)
Merge branch 'platal-0.9.15'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 22 Feb 2008 19:51:50 +0000 (20:51 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 22 Feb 2008 19:51:50 +0000 (20:51 +0100)
Conflicts:

configs/mails.conf

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

diff --cc configs/mails.conf
Simple merge
plat/al