This is an automated email from the git hooks/post-receive script. New commit to branch master in repository faxtomail. See http://git.codelutin.com/faxtomail.git 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 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>.