conflit réglé merge master et regionalisation
authorDavin Baragiotta <davin.baragiotta@auf.org>
Tue, 5 Jun 2012 21:46:46 +0000 (17:46 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Tue, 5 Jun 2012 21:46:46 +0000 (17:46 -0400)
commit82c5e37da28f9877f27f77589dc6eb11077c8b81
tree45d0b36b1486bf263cda6e44fa99dea49a76d0a4
parent82b9289962534c2f917ea00e799d4af087f32303
parentf427129b3ca4c383c600be36a4fde52ebb723b9a
conflit réglé merge master et regionalisation
project/dae/admin.py
project/decorators.py
project/menu.py
project/recrutement/admin.py
project/rh/admin.py
project/rh/models.py
project/rh/templatetags/rapports.py
project/rh/views.py
project/settings.py
versions.cfg