conflit réglé
authorDavin Baragiotta <davin.baragiotta@auf.org>
Tue, 5 Jun 2012 19:11:56 +0000 (15:11 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Tue, 5 Jun 2012 19:11:56 +0000 (15:11 -0400)
commit2cb9e5551bf3c97935521f6ac85769a3a1a7d11a
treeec48cd76679026ad8ddb91701761b78da8d8a950
parent1a7b9e368dadaa616e3a1bde98c9e73cdd6205f8
parentbe037e09c0f37692bf8694caa404ff49f8f62654
conflit réglé
project/rh/urls.py
project/rh/views.py