Correction des conflits
authorNilovna Bascunan-Vasquez <contact@nilovna.com>
Thu, 30 Jun 2011 20:37:02 +0000 (16:37 -0400)
committerNilovna Bascunan-Vasquez <contact@nilovna.com>
Thu, 30 Jun 2011 20:37:02 +0000 (16:37 -0400)
commit1f6e351e967b83a09a16cdaac8e6e7c27e4eeeff
treefc87cf72dcce0745f5b3ad8d182021970f4bd910
parentb89fef740b0601590bfdfeac5c79294548dccebb
parent1df9fc7fefefd350023317478a2818720400b8b5
Correction des conflits
project/recrutement/admin.py
project/recrutement/models.py