projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf81c35 daa6617)
Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 7 Dec 2008 15:19:52 +0000 (16:19 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 7 Dec 2008 15:19:52 +0000 (16:19 +0100)
Conflicts:

modules/profile/jobs.inc.php

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

diff --cc modules/profile.php
Simple merge
diff --cc templates/profile/jobs.job.tpl
Simple merge
plat/al