This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit b33a9340bc26e136827c05504635d145d55f4a02 Merge: 28c3062 d7206b6 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Feb 29 14:38:22 2016 +0100 Merge branch 'feature/8004-new-way-input-themes-keywords' into develop coselmar-ui/src/main/webapp/css/coselmar.css | 11 +++++++ .../src/main/webapp/js/coselmar-controllers.js | 34 ++++++++++++++++++++-- .../main/webapp/views/documents/editDocument.html | 32 ++++++++++++++------ .../main/webapp/views/documents/newdocument.html | 24 +++++++++++---- .../main/webapp/views/questions/editquestion.html | 32 +++++++++++++++----- 5 files changed, 109 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.