branch master updated (749e32a4 -> 82ccbcac)
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 749e32a4 [jgitflow-maven-plugin]merging 'release/4.0.9' into 'master' adds 86d2a613 [jgitflow-maven-plugin]updating poms for 4.0.10-SNAPSHOT development adds c0be8db2 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6b89c770 [jgitflow-maven-plugin]merging 'master' into 'develop' adds b798821a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 26fd4866 fixes #9130: Mise à jour de struts 2.3.32 adds 934b12d4 From scmwebeditor -- fghg adds 74709a53 From scmwebeditor -- fghg adds 70286a81 From scmwebeditor -- fdh adds 4eb069c1 From scmwebeditor -- trh adds 0d79d75d Change label adds 531d0a06 Rename field for export adds b7ec578b Add voyage in SaCategory key adds e859a4ec Fix release ... adds abf28b34 [jgitflow-maven-plugin]updating poms for branch'release/4.0.10' with non-snapshot versions adds 82ccbcac [jgitflow-maven-plugin]merging 'release/4.0.10' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 23 +++++++++++++++++- echobase-services/pom.xml | 23 +++++++++++++++++- .../service/atlantos/xml/XmlAccousticExport.java | 8 +++---- .../service/atlantos/xml/XmlBioticExport.java | 9 ++++---- echobase-ui/pom.xml | 23 +++++++++++++++++- .../resources/i18n/echobase-ui_fr_FR.properties | 2 +- .../src/main/webapp/WEB-INF/includes/footer.jsp | 2 +- .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 2 +- pom.xml | 27 +++++++++++++++++++--- src/site/en/rst/importData.rst | 2 +- src/site/en/rst/removeData.rst | 22 ++++++++---------- src/site/en/rst/update.rst.vm | 2 +- 12 files changed, 113 insertions(+), 32 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm