This is an automated email from the git hooks/post-receive script. New commit to branch master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b86dabba0647d4093448574acef0b1652ff2f380 Merge: 15ce292f 48d4d50f Author: jcouteau <couteau@codelutin.com> Date: Wed Mar 17 14:52:21 2021 +0100 Merge branch 'release/4.2' .gitlab-ci.yml | 23 ++++++ echobase-domain/pom.xml | 6 +- echobase-services/pom.xml | 2 +- .../service/atlantos/xml/XmlAccousticExport.java | 2 +- .../service/atlantos/xml/XmlBioticExport.java | 7 +- .../actions/ImportCalibrationActionSupport.java | 5 -- echobase-ui/pom.xml | 2 +- .../ui/actions/AbstractJSONPaginedAction.java | 2 +- pom.xml | 6 +- src/site/en/rst/exportAtlantos.rst | 19 ++--- src/site/en/rst/importData.rst | 47 +++++++++++++ src/site/en/rst/index.rst | 20 +++--- src/site/rst/exportAtlantos.rst | 27 ++++---- src/site/rst/importData.rst | 81 +++++++++++++++++----- src/site/rst/index.rst | 17 ++--- src/site/site_en.xml | 47 ++++--------- src/site/site_fr.xml | 47 +++---------- 17 files changed, 221 insertions(+), 139 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.