Merge branch 'dev', remote-tracking branch 'origin' into masse_salariale_jp
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 16 Mar 2012 14:30:47 +0000 (09:30 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 16 Mar 2012 14:30:47 +0000 (09:30 -0500)
commit26c032cc22551d10c8a994fb1b2c22ba23b610c3
tree179e2f73b5d10577e560795b77d12ef1bf03beb7
parent958e67e8d6d1b2173ddab37b42332e27a8ccd71e
parent88a0e98d0bb30c0061002e5fcdb7d7b848cc5e8a
Merge branch 'dev', remote-tracking branch 'origin' into masse_salariale_jp
project/rh/views.py