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 f9965bc no fixed height for print vote, and action for vote on one line new fea63ee [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2e5a2c7 [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-2' with snapshot versions new 113d23d [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-2' with non-snapshot versions new 733e247 fix license headers new 613b614 Merge branch 'release/2.0-alpha-2' new dc6fdef Merge branch 'master' into develop new d302d01 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 d302d01a5066fec4848df0724241c0bca38978ac Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:23:05 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state 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 commit fea63eee6b63e197bba3ca4901b8b2cb56abe499 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:23:03 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 613b614a5ba421c1a602e2c4c880fa68af83592f Merge: e5a1179 733e247 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:22:58 2014 +0200 Merge branch 'release/2.0-alpha-2' commit 733e247446e39ec52302dcd28ef965ef04a3c31d Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:22:30 2014 +0200 fix license headers commit 113d23decfa4479ddd86d1d37e95d18311c393f6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 16:57:27 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-2' with non-snapshot versions Summary of changes: 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>.