This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 354d32b Merge branch 'develop' of https://git.chorem.org/pollen into develop adds f023936 Fix typos, case and some anglicisms in the french i18nbundle new fb29704 Merge remote-tracking branch 'origin/feature/capello-master-on-fire' into develop The 1 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 fb297041573d929a6f613150d194d2a2680f5af4 Merge: 354d32b f023936 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 29 15:49:39 2014 +0200 Merge remote-tracking branch 'origin/feature/capello-master-on-fire' into develop Conflicts: pollen-ui-angular/src/main/webapp/i18n/fr.js Summary of changes: pollen-ui-angular/src/main/webapp/i18n/fr.js | 81 ++++++++++++++-------------- 1 file changed, 40 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.