This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 86eaaef75899eb69e1fd404423b3de8a2ed52261 Merge: 29a5c2b 80d9669 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:17:07 2015 +0000 Merge branch 'release/5.0-RC5' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/wao/WaoApplicationConfig.java | 5 ----- .../src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java | 5 ----- .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 2 +- wao-services/pom.xml | 2 +- .../main/java/fr/ifremer/wao/services/service/ContactsService.java | 2 +- .../java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java | 2 +- .../main/java/fr/ifremer/wao/services/service/mail/EmailService.java | 5 +++-- .../src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java | 2 ++ wao-web/pom.xml | 2 +- wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 14 files changed, 15 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.