This is an automated email from the git hooks/post-receive script. New change to branch master in repository wao. See http://git.codelutin.com/wao.git from 86eaaef Merge branch 'release/5.0-RC5' adds 29d7ece [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5a0b610 Merge branch 'master' into develop adds ba469dd [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 079034c Ajout d'éléments à la liste des groupes de paramètres à mesurer (termine #6689) adds 429443c [jgitflow-maven-plugin]updating poms for branch'release/5.0' with non-snapshot versions adds fce17c4 Merge branch 'release/5.0' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../wao/entity/IndividualMeasurementStrategy.java | 43 +++++++--------------- .../i18n/wao-persistence_en_GB.properties | 20 +++++++--- .../i18n/wao-persistence_fr_FR.properties | 20 +++++++--- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 7 files changed, 46 insertions(+), 45 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.