This is an automated email from the git hooks/post-receive script. New change to branch master in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 3355de3 [jgitflow-maven-plugin]merging 'release/2.0.1' into 'master' adds 8ecde7e [jgitflow-maven-plugin]updating poms for 2.0.2-SNAPSHOT development adds a10c3a0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 924d5a0 [jgitflow-maven-plugin]merging 'master' into 'develop' adds fcc8d65 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 39e6d29 fix gitignore and remove orig files adds c22f8de Add test for findArchivedEmail() adds 02504d5 Use pdfbox version 2.0.0-RC1 adds 2b6c22c fixes #7685 Récupération des clients quand l'utilisateur n'a pas le droit de lecture sur le dossier portant la société adds 2016f62 ajout automatique du wildcard null sur toutes les combo filtrable adds 0865995 [jgitflow-maven-plugin]updating poms for branch'release/2.0.2' with non-snapshot versions adds b9703f2 [jgitflow-maven-plugin]merging 'release/2.0.2' into 'master' No new revisions were added by this update. Summary of changes: .gitignore | 2 + faxtomail-persistence/pom.xml | 2 +- faxtomail-persistence/pom.xml.orig | 169 ---- faxtomail-service/pom.xml | 2 +- faxtomail-service/pom.xml.orig | 259 ------ .../services/service/ClientServiceImpl.java | 12 + .../services/service/EmailServiceTest.java | 50 +- .../services/service/InitTestDataImpl.java | 19 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-swing/pom.xml.orig | 792 ---------------- .../ui/swing/content/search/SearchUIHandler.java | 1 - .../util/AbstractFaxToMailDemandListHandler.java | 9 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 7 + faxtomail-ui-web/pom.xml | 2 +- faxtomail-ui-web/pom.xml.orig | 398 -------- pom.xml | 4 +- pom.xml.orig | 999 --------------------- 17 files changed, 76 insertions(+), 2653 deletions(-) delete mode 100644 faxtomail-persistence/pom.xml.orig delete mode 100644 faxtomail-service/pom.xml.orig delete mode 100644 faxtomail-ui-swing/pom.xml.orig delete mode 100644 faxtomail-ui-web/pom.xml.orig delete mode 100644 pom.xml.orig -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.