This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 9815cc7b supression de fichier inutile adds a7f4703e hot fix sur la visibilité des résultats adds 06d78498 Merge branch 'hotfix/3.1.3' new f26bdb13 Merge branch 'master' 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 f26bdb13a77186f84fc6ef9b61a1897784c85402 Merge: 9815cc7b 06d78498 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 15 11:55:42 2018 +0200 Merge branch 'master' into develop # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # pollen-ui-riot-js/package.json # pollen-ui-riot-js/pom.xml # pollen-votecounting-aggregator/pom.xml # pollen-votecounting-api/pom.xml # pollen-votecounting-borda/pom.xml # pollen-votecounting-condorcet/pom.xml # pollen-votecounting-coombs/pom.xml # pollen-votecounting-cumulative/pom.xml # pollen-votecounting-instant-runoff/pom.xml # pollen-votecounting-majority-judgment/pom.xml # pollen-votecounting-normal/pom.xml # pollen-votecounting-number/pom.xml # pom.xml Summary of changes: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.