projets / auf_rh_dae.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58014ae 3fdb373)
Merge remote-tracking branch 'origin/master' into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 8 Mar 2012 17:05:15 +0000 (11:05 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 8 Mar 2012 17:05:15 +0000 (11:05 -0600)
Conflicts:
project/rh/views.py

1  2 
project/rh/views.py patch | diff1 | diff2 | blob | history

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