merge qbe in rh : conflits réglés
authorDavin Baragiotta <davin.baragiotta@auf.org>
Thu, 10 Nov 2011 16:57:10 +0000 (11:57 -0500)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Thu, 10 Nov 2011 16:57:10 +0000 (11:57 -0500)
commite158c6de074f4b9c374233cadf5e834492c75d52
treea1f3c262e1314813cae53d80e7943937707d0e71
parentabf721ab10ec577c1215e3931ceefd67134423f2
parent3f5f38980bfd7ba6d101ee7ace5b107deb1e4688
merge qbe in rh : conflits réglés
buildout.cfg
project/dae/models.py
project/recrutement/models.py
project/rh/models.py
project/settings.py
project/urls.py
src/auf.django.emploi/auf/django/emploi/models.py