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 7896917a4ebf23b56f61b1b36ce97f558135b9bd Merge: ba33c15 d69ec96 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 10:17:47 2015 +0100 Fixes #6553 Merge branch 'feature/6553-fix-advanced-search-users' into develop .../persistence/entity/CoselmarUserTopiaDao.java | 11 +-- .../src/main/webapp/js/coselmar-controllers.js | 17 ++-- .../src/main/webapp/views/users/adminUsers.html | 27 +----- .../src/main/webapp/views/users/searchPart.html | 97 ++++++++++++++++++++++ .../main/webapp/views/users/supervisorUsers.html | 62 +------------- 5 files changed, 115 insertions(+), 99 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.