Merge branch 'master' into test
authorEric Mc Sween <eric.mcsween@auf.org>
Mon, 21 Nov 2011 19:18:15 +0000 (14:18 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Mon, 21 Nov 2011 19:18:15 +0000 (14:18 -0500)
1  2 
project/dae/templates/dae/postes_liste.html
project/dae/workflow.py

Simple merge