This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 4684b92 Revert previous fix on DmdConverter (Fixes #4140) new 56227a4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d708764 [jgitflow-maven-plugin]updating poms for 2.40 branch with snapshot versions new 0abd8b5 [jgitflow-maven-plugin]updating poms for branch'release/2.40' with non-snapshot versions new b69818b [jgitflow-maven-plugin]merging 'release/2.40' into 'master-2.x' new accbb39 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' new 68b7c2a [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 68b7c2aed4f320f218a99f957f6af0c3c0ea8be7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 20 13:08:38 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit accbb391341ff317d601fd31750fc3feb48f4fb7 Merge: 56227a4 b69818b Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 20 13:08:38 2017 +0100 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' commit 56227a4fc9147a498d81e73842652cc735f22359 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 20 13:08:38 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b69818bec0853d34241be3641e7d7bbf99aa7bb8 Merge: dccab0a 0abd8b5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 20 13:08:35 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.40' into 'master-2.x' commit 0abd8b5e6f786a4a2b561ab8b380443895b1c68a Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 20 13:04:16 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.40' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.