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 f85227fdc9283863b438a1055161b74fb008da6d Merge: a30014ac acfd6d52 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 20 11:23:38 2018 +0100 Merge branch 'release/2.4.6' 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 +- .../franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java | 11 +++++++++++ .../swing/content/demande/actions/LoadFolderEmailsAction.java | 8 ++++++-- faxtomail-ui-swing/src/main/resources/log4j2.xml | 1 + faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 23 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.