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 c489e6a27a09922fc976f55f73f9ec2bfad8290c Merge: 5e0d885 78b17b9 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 20 15:17:13 2015 +0100 fixes #6308 : Merge branch 'feature/6308-supervisor-can-create-client' into develop .../coselmar/services/v1/UsersWebService.java | 61 ++++++++-- coselmar-ui/src/main/webapp/index.html | 12 +- .../src/main/webapp/js/coselmar-controllers.js | 8 +- .../views/users/{users.html => adminUsers.html} | 14 +-- .../src/main/webapp/views/users/edituser.html | 13 ++- .../users/{users.html => supervisorUsers.html} | 49 ++------ coselmar-ui/src/main/webapp/views/users/users.html | 123 +-------------------- 7 files changed, 95 insertions(+), 185 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.