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 b41ed014dd7805eb9c04b905b42e6d40adb925e1 Merge: 31a0b8ee dd0ec219 Author: Maven Release <maven-release@codelutin.com> Date: Fri Nov 17 17:25:20 2017 +0100 Merge branch 'release/2.4.2' 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/swing/FaxToMailUIContext.java | 4 + .../ui/swing/actions/ShowDemandeAction.java | 4 +- .../ui/swing/content/demande/DemandeUIHandler.java | 98 +++++++++++----------- .../ui/swing/content/demande/DemandesUI.jaxx | 3 +- .../swing/content/demande/DemandesUIHandler.java | 28 +------ .../demande/demandgroup/DemandGroupUIHandler.java | 1 + .../util/FaxToMailValidatorMessageWidget.java | 42 ++++++++++ .../util/toolbar/AbstractToolbarPopupButton.java | 50 ++++++----- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 137 insertions(+), 103 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.