master in test : conflit réglé
authorDavin Baragiotta <davin.baragiotta@auf.org>
Wed, 9 Nov 2011 21:11:12 +0000 (16:11 -0500)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Wed, 9 Nov 2011 21:11:12 +0000 (16:11 -0500)
commit956222aecd326b69a5591f8b67922e044e726f7c
tree9af869aa1922eb6374c0442438ba8a1fa824ba3f
parentdde3eb80421fd1efba14b475f0d5b61f5bdd5911
parent829eb351b36b27b05638d99d5ea8717604106cc9
master in test : conflit réglé
buildout.cfg
project/dae/models.py
project/dae/templates/dae/poste.html
project/dae/templates/dae/postes_liste.html
project/dae/workflow.py