This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 085fa9eb010220b04d2169d259659e457432f95f Merge: 47e2e0a 7987520 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 21 15:56:34 2015 +0100 Ne pas masquer la vue entre labo appartenant à la même société (fixes #6490) .../ifremer/wao/services/AuthenticatedWaoUser.java | 8 +++++ .../wao/services/service/ContactsService.java | 32 +++++++++++++----- .../ifremer/wao/services/service/SamplingPlan.java | 2 +- .../wao/services/service/SamplingPlanService.java | 15 +++++---- .../service/SclerochronologySamplingPlan.java | 7 ++++ .../SclerochronologySamplingPlanServiceTest.java | 2 +- .../main/webapp/WEB-INF/content/boat-details.jsp | 38 ++++++++++++---------- .../content/sclerochronology/sampling-plan.jsp | 2 +- 8 files changed, 69 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.