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 4b260977f019b6d21a47675056d17d06af1050e4 Merge: 21521ad 97d66bd Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 13:37:53 2015 +0000 fusion de la banche 'feature/6910-obsVente-effort-bis' sur develop (termine #6910) .../service/ObsVenteSamplingPlanBuilder.java | 40 +++++-- .../wao/services/service/SynthesisService.java | 119 +++++++++++++-------- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../WEB-INF/content/edit-sample-row-input.jsp | 10 +- .../WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- 6 files changed, 115 insertions(+), 58 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.