This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 54867470c4fa08c3c444701622fa0afbf0a8340a Merge: 33d60db 8f3b127 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri May 29 15:13:01 2015 +0200 Merge branch 'feature/1186' into develop lima-swing/pom.xml | 3 +++ lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java | 2 +- lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties | 6 +++--- lima-swing/src/main/resources/lima-swing.config | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.