This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See http://git.codelutin.com/echobase.git from 437ca02 [jgitflow-maven-plugin]merging 'release/2.10' into 'master' adds aaab304 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 13477a3 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 2c797de [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds bfebe5a Utilisation d'un Set plutot que d'utiliser une collection adds 2185b33 Augmentation de la taille des fichiers qu'on peut uploader lors d'un import (See #7865) adds 26e222c Correction du format de cellvolume (c'est un float et non pas un integer) (See #7865) adds ecc1b0c [jgitflow-maven-plugin]updating poms for 2.9.1 branch with snapshot versions adds 0494feb [jgitflow-maven-plugin]updating poms for branch'release/2.9.1' with non-snapshot versions adds ca9ca02 [jgitflow-maven-plugin]merging 'release/2.9.1' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java | 7 ++++--- echobase-services/pom.xml | 2 +- .../services/service/importdata/csv/AcousticImportModel.java | 2 +- echobase-ui/pom.xml | 2 +- echobase-ui/src/main/resources/struts.xml | 2 +- pom.xml | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.