conflit réglé
authordavin baragiotta <davin.baragiotta@u-db.(none)>
Tue, 5 Apr 2011 22:37:07 +0000 (18:37 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Tue, 5 Apr 2011 22:37:07 +0000 (18:37 -0400)
commit9a85768a3216c2d1d43aee6d1a669a8b327a79f0
tree7075978c62805f99f4f03c8d68619e5da99b4d9b
parent498881f4ae1589834fe37eef50c61dacf8badc65
parent612d856007af2b45bd6af26709ea95f2513858b3
conflit réglé
project/dae/models.py
project/dae/templates/dae/poste.html
project/dae/templates/dae/postes_liste.html