This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 3ce9034 [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' adds bbcc990 Change localId for cruise by the voyage name adds e6d74ed Fix for biology export adds 841fe2b [jgitflow-maven-plugin]updating poms for 4.0.5-SNAPSHOT development adds f998d17 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 77a4916 [jgitflow-maven-plugin]merging 'master' into 'develop' adds de308a2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 15c690f Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop adds 38fa0ba Add error when the operation is not found adds 7148576 [jgitflow-maven-plugin]updating poms for branch'release/4.0.5' with non-snapshot versions adds 9658664 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../i18n/echobase-domain_fr_FR.properties | 8 ++-- echobase-services/pom.xml | 2 +- .../service/atlantos/ExportAtlantosService.java | 2 +- .../service/atlantos/xml/XmlAccousticExport.java | 4 +- .../service/atlantos/xml/XmlBioticExport.java | 10 ++--- .../VoyageCatchesBiometrySampleImportAction.java | 50 ++++++++++++---------- .../i18n/echobase-services_fr_FR.properties | 2 +- echobase-ui/pom.xml | 2 +- .../ui/actions/exportAtlantos/Configure.java | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 22 +++++----- .../resources/i18n/echobase-ui_fr_FR.properties | 22 +++++----- pom.xml | 2 +- src/site/en/rst/importData.rst | 10 +++++ src/site/rst/importData.rst | 10 +++++ src/site/rst/install.rst.vm | 3 ++ 16 files changed, 90 insertions(+), 63 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.