This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from de308a2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new bbcc990 Change localId for cruise by the voyage name new e6d74ed Fix for biology export new 15c690f Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 15c690f2f7b0feb842d5f65971a15ab7d0b1d8fb Merge: e6d74ed de308a2 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Nov 23 10:43:23 2016 +0100 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop commit e6d74ed5c595b1963b52cb1e5ba6a774faee8dde Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Nov 23 10:35:30 2016 +0100 Fix for biology export commit bbcc990ab00dbbcb0fca67c933cd0f4eaf2ca7d2 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Nov 23 09:20:53 2016 +0100 Change localId for cruise by the voyage name Summary of changes: .../service/atlantos/ExportAtlantosService.java | 2 +- .../service/atlantos/xml/XmlAccousticExport.java | 2 +- .../service/atlantos/xml/XmlBioticExport.java | 10 ++--- .../VoyageCatchesBiometrySampleImportAction.java | 47 +++++++++++----------- .../ui/actions/exportAtlantos/Configure.java | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 22 +++++----- .../resources/i18n/echobase-ui_fr_FR.properties | 22 +++++----- src/site/rst/install.rst.vm | 3 ++ 8 files changed, 57 insertions(+), 53 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.