[Pollen-commits] [pollen] 05/06: Merge branch 'master' into develop

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit dc6fdef72617b13a1774042a8533c2c3e47298a7 Merge: fea63ee 613b614 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:23:04 2014 +0200 Merge branch 'master' into develop pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 ++-- .../main/webapp/partials/user-edit-viewProfile.html | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.