This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit c57e0252f4e703abbbbb8675dd14065918159efe Merge: b5effd0a 1ade89f6 Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:15:13 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.11' into 'master' faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailTopiaDao.java | 38 +++- faxtomail-service/pom.xml | 2 +- .../services/service/ConfigurationServiceImpl.java | 9 +- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 236 ++++++++++----------- .../faxtomail/ui/swing/util/JImagePanel.java | 3 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 16 +- 10 files changed, 172 insertions(+), 142 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.