This is an automated email from the git hooks/post-receive script. New change to branch master-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 3c50e270 [jgitflow-maven-plugin]merging 'release/1.1.16' into 'master-1.1.x' adds 83268e35 [jgitflow-maven-plugin]updating poms for 1.1.17-SNAPSHOT development adds 668942b4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e9f56f0c [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' adds c4cfe4c1 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds a8a4935c Fix General CMM error517 Exception thrown at users adds 2059c85c Use tomcat plugin snapshot version adds bfed26ad Prevent StackOverflow error from making email reception fail adds 0f57bc40 comment tomcat plugin snapshot version adds 4d2250ca Fix release ... adds c82ff3f1 [jgitflow-maven-plugin]updating poms for branch'release/1.1.17' with non-snapshot versions adds a20321f2 [jgitflow-maven-plugin]merging 'release/1.1.17' into 'master-1.1.x' No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/util/JImagePanel.java | 4 ++++ faxtomail-ui-web/pom.xml | 21 ++++++++++++++++++++- .../faxtomail/web/job/MailFilterJob.java | 5 +++-- pom.xml | 2 +- 7 files changed, 31 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.