This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from b777525 Fusion de la branche 6049 dans develop new 68ae88c On ajoute une règle de validation pour empêcher l'erreur qui survient lorsqu'on essaie d'envoyer un mail à utilisateur inactif (fixes #6052) new 30ff5e9 Fusion de la branche 6052 dans develop 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 30ff5e9ce7250b4aa8e52c4cae8fe93efc5c2853 Merge: b777525 68ae88c Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 12:37:30 2014 +0100 Fusion de la branche 6052 dans develop commit 68ae88cf5b124ebaacab80c503c0727e636e9db7 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 12:36:23 2014 +0100 On ajoute une règle de validation pour empêcher l'erreur qui survient lorsqu'on essaie d'envoyer un mail à utilisateur inactif (fixes #6052) Summary of changes: .../fr/ifremer/wao/web/action/administration/EditWaoUserAction.java | 4 ++++ wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 1 + wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 1 + 3 files changed, 6 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.