projets / auf_rh_dae.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a975f5f 36231f0)
Merge branch 'preprod' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 15 Feb 2012 20:07:45 +0000 (15:07 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 15 Feb 2012 20:07:45 +0000 (15:07 -0500)
1  2 
project/settings.py patch | diff1 | diff2 | blob | history

diff --cc project/settings.py
Simple merge
RH - Demande d'autorisation d'embauche/emploi