Merge branch 'dev', remote-tracking branch 'origin' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 14 Mar 2012 21:29:07 +0000 (16:29 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 14 Mar 2012 21:29:07 +0000 (16:29 -0500)
commit7634a56edfdd8ff5479b400a3c69970701b859b5
tree789963563f143bb21e27393339e9cbc8c0cb9d79
parent4d17560e22e60ebdd8b69c9849657934a43c66f3
parent5a165e95dad42d281f041ff656438fa09f28b6b2
Merge branch 'dev', remote-tracking branch 'origin' into masse_salariale_jp
project/rh/views.py