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 fbe654321e5b9b345ca25deb87bb4de120f73e7d Merge: d0e5375c 44d738b5 Author: Jean Couteau <couteau@codelutin.com> Date: Wed Feb 10 18:41:19 2021 +0100 Merge branch 'release/2.5.5' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../services/service/LdapServiceImpl.java | 8 ++- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/actions/ShowDemandeAction.java | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 6 +-- faxtomail-ui-web/pom.xml | 18 +++---- .../faxtomail/web/action/admin/LdapAction.java | 8 ++- .../WEB-INF/content/admin/import-archive-input.jsp | 2 +- .../main/webapp/WEB-INF/content/demand-detail.jsp | 6 +-- .../main/webapp/WEB-INF/content/search-input.jsp | 2 +- faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml | 31 ++++++++--- pom.xml | 62 +++++++++++++++++----- 13 files changed, 106 insertions(+), 45 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.