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 59782991dbfce11506a851bf91e614baac40a06b Merge: dae9143 ba33c15 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 16:32:12 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop coselmar-ui/src/main/webapp/css/coselmar.css | 5 ++++- coselmar-ui/src/main/webapp/i18n/en.js | 22 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 22 ++++++++++++++++++++++ .../src/main/webapp/js/coselmar-controllers.js | 4 ++-- .../src/main/webapp/views/documents/documents.html | 4 ++-- .../main/webapp/views/documents/editDocument.html | 16 ++++++++++++++-- .../webapp/views/documents/modalDocumentEdit.html | 16 ++++++++++++++-- .../main/webapp/views/documents/newdocument.html | 16 ++++++++++++++-- .../main/webapp/views/documents/viewDocument.html | 16 ++++++++++++++-- .../main/webapp/views/questions/editquestion.html | 17 ++++++++++++----- .../main/webapp/views/questions/viewquestion.html | 4 +++- .../src/main/webapp/views/users/edituser.html | 2 +- 12 files changed, 124 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.