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 9eabb48deb50fab0d909a8f37f15a2f5458caff5 Merge: 86d2bb9 d2a2f30 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Feb 12 16:13:15 2015 +0100 Fusion #6641 dans develop .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 14 ++++++++++++++ .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 3 ++- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 5 +++++ ...cies,_add_laboratories,_add_sclerochronology.sql | 4 ++++ wao-persistence/src/main/xmi/wao-model.zargo | Bin 62375 -> 62432 bytes .../ifremer/wao/services/AuthenticatedWaoUser.java | 9 ++++++++- .../wao/services/service/ContactsService.java | 12 +++--------- .../services/service/SampleRowsFilterValues.java | 11 +++++++++++ .../wao/services/service/SamplingPlanService.java | 10 +++------- .../service/administration/CompaniesService.java | 2 +- 10 files changed, 51 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.