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 1129420 Merge branch 'release/1.1.1' adds c7e00fd remove log adds 1a08ea7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2e16a90 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 75bc8f3 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 9da6253 [jgitflow-maven-plugin]updating poms for 1.1.2-SNAPSHOT development adds 4aca135 Merge branch 'develop' of https://git.codelutin.com/faxtomail into develop adds 15ab647 set pom version adds b0dbc81 fixes #7533 Ne plus prendre en compte les noms de domaine dans les adresses expéditeur dans les réponses new e5c5012 [jgitflow-maven-plugin]updating poms for branch'release/2.0' with non-snapshot versions new a13f4d9 Merge branch 'release/2.0' The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a13f4d97cbc08be5c4c80bd4ac59d20ec3ccdd53 Merge: 1129420 e5c5012 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 17 15:56:27 2015 +0200 Merge branch 'release/2.0' Conflicts: faxtomail-persistence/pom.xml faxtomail-service/pom.xml faxtomail-ui-swing/pom.xml faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java faxtomail-ui-web/pom.xml pom.xml commit e5c5012e27ea47fc2eb76cae985fbd04f934ec63 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 17 15:48:10 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.0' with non-snapshot versions Summary of changes: faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/content/reply/ReplyFormUIModel.java | 3 +-- .../faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java | 2 -- faxtomail-ui-web/pom.xml | 2 +- .../src/main/webapp/WEB-INF/content/admin/configuration-input.jsp | 4 ++-- pom.xml | 4 +--- 8 files changed, 8 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.