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 e76f3bc Merge branch 'release/1.1.4' into master-1.1.x adds 3e10848 [jgitflow-maven-plugin]updating poms for 1.1.5-SNAPSHOT development adds c8523fb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 97b1dfe Merge branch 'master-1.1.x' into develop-1.1.x adds 92ae41b [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5602d1e retour en arrière sur l'héritage des droits de lecture adds d65839e fix tests adds d65d656 [jgitflow-maven-plugin]updating poms for branch'release/1.1.5' with non-snapshot versions adds 1e33e6c Merge branch 'release/1.1.5' into master-1.1.x No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailTopiaDao.java | 1 - .../persistence/entities/MailFolderTopiaDao.java | 9 +----- faxtomail-service/pom.xml | 2 +- .../services/service/ConfigurationServiceImpl.java | 6 ---- .../services/service/EmailServiceImpl.java | 29 +++++++++++++++++- .../services/service/MailFolderService.java | 2 -- .../services/service/MailFolderServiceImpl.java | 12 ++------ .../services/service/InitTestDataImpl.java | 35 ++++++++-------------- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- .../src/main/webapp/js/configuration.js | 14 --------- pom.xml | 2 +- 13 files changed, 50 insertions(+), 68 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.