conflit réglé
authordavin baragiotta <davin.baragiotta@u-db.(none)>
Fri, 8 Apr 2011 03:22:16 +0000 (23:22 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Fri, 8 Apr 2011 03:22:16 +0000 (23:22 -0400)
commitb9d81e901d3aa87c8f3496ffe6aefc6db325f566
treebbbb7c3abe417c98f27ca3b9915ad5939fe266d1
parentda3ca95529c634d9362245abe5f814515d37b73b
parentf96faf648a859943349a13be76c48ea26707154b
conflit réglé
project/dae/models.py
project/dae/templates/dae/poste.html
project/dae/views.py