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 48ae56af0bcc14b5e94afc3886649cd3ec47c74e Merge: f85227fd a399b90f Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 13 10:50:38 2018 +0100 Merge branch 'release/2.4.7' 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 | 6 ++++-- pom.xml | 2 +- 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>.