-
git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjilMathieu Giraud authored
Conflicts: browser/css/vidjil.less browser/index.html browser/js/database.js browser/js/main.js server/web2py/applications/Vidjil/views/default/patient.html
6c17d073
Conflicts: browser/css/vidjil.less browser/index.html browser/js/database.js browser/js/main.js server/web2py/applications/Vidjil/views/default/patient.html