This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from fb5757bb [jgitflow-maven-plugin]updating poms for 1.1.18-SNAPSHOT development new 0a0a8d43 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 4d2250ca Fix release ... new c82ff3f1 [jgitflow-maven-plugin]updating poms for branch'release/1.1.17' with non-snapshot versions new a20321f2 [jgitflow-maven-plugin]merging 'release/1.1.17' into 'master-1.1.x' new 7749d582 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' new ce2a5d7b [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ce2a5d7b995942305ab5238e40169683b5c8b2c5 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:43 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 7749d582c507a93cd432209bc6738f24d8d83313 Merge: 0a0a8d43 a20321f2 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:43 2018 +0200 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' commit 0a0a8d43a3d0f0e39deca3c31659508111ea1a45 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:43 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a20321f2a6bb70cc89ea78560c6eb632379062be Merge: 3c50e270 c82ff3f1 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:41 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.1.17' into 'master-1.1.x' commit c82ff3f151925c5c7e4edb24c25a403401f00ea5 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:56:56 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.1.17' with non-snapshot versions commit 4d2250ca0b724a805075fddd8d471119ac6bbed2 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:56:46 2018 +0200 Fix release ... Summary of changes: .../java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.