This is an automated email from the git hooks/post-receive script. New change to branch master-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 0af7347 [jgitflow-maven-plugin]merging 'release/1.1.10' into 'master-1.1.x' adds 0259281 [jgitflow-maven-plugin]updating poms for 1.1.11-SNAPSHOT development adds ec1c179 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6550708 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' adds 247e0d8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 8d836a1 ajout du filtre sur la colonne subject (fixes #8103) adds 3b7b4dd [jgitflow-maven-plugin]updating poms for branch'release/1.1.11' with non-snapshot versions adds 1e7e0d0 [jgitflow-maven-plugin]merging 'release/1.1.11' into 'master-1.1.x' No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../faxtomail/persistence/entities/EmailFilter.java | 14 ++++++++++++++ .../faxtomail/persistence/entities/EmailTopiaDao.java | 11 +++++++++++ faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/demande/DemandeListTableFilter.java | 4 ++++ .../ui/swing/content/demande/DemandeListUIHandler.java | 4 ++++ faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 38 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.