This is an automated email from the git hooks/post-receive script. New commit to branch master in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit b5effd0a4b112b03545e04ed9d3440c090c53763 Merge: 0218b8d5 45722e5a Author: Jean Couteau <couteau@codelutin.com> Date: Mon Apr 23 16:53:09 2018 +0200 Merge branch 'release/2.4.10' Conflicts: faxtomail-persistence/pom.xml faxtomail-service/pom.xml faxtomail-ui-swing/pom.xml faxtomail-ui-web/pom.xml pom.xml faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- .../main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java | 4 +++- pom.xml | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.