projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 661e78f 27614f4)
Merge branch 'master' of /home/git/platal
authorStéphane Jacob <jacou@melix.net>
Mon, 19 May 2008 23:32:41 +0000 (01:32 +0200)
committerStéphane Jacob <jacou@melix.net>
Mon, 19 May 2008 23:32:41 +0000 (01:32 +0200)
1  2 
modules/email.php patch | diff1 | diff2 | blob | history
templates/admin/utilisateurs.tpl patch | diff1 | diff2 | blob | history

diff --cc modules/email.php
Simple merge
diff --cc templates/admin/utilisateurs.tpl
Simple merge
plat/al