This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit a34520d3956c9a7b7469953ef719e8a32a6ea83e Merge: 93c275a d844843 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 14:51:41 2015 +0100 fixes #6431 Merge branch 'feature/6431-document-type-as-defined-list' into develop coselmar-ui/src/main/webapp/i18n/en.js | 14 ++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 14 ++++++++++++++ coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 4 ++-- .../src/main/webapp/views/documents/editDocument.html | 16 ++++++++++++++-- .../main/webapp/views/documents/modalDocumentEdit.html | 16 ++++++++++++++-- .../src/main/webapp/views/documents/newdocument.html | 16 ++++++++++++++-- .../src/main/webapp/views/documents/viewDocument.html | 16 ++++++++++++++-- 7 files changed, 86 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.