]> source.dussan.org Git - sonarqube.git/commitdiff
Automatic merge from branch-7.0
authorssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Mon, 5 Feb 2018 07:01:12 +0000 (08:01 +0100)
committerssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Mon, 5 Feb 2018 07:01:12 +0000 (08:01 +0100)
* origin/branch-7.0:
  Prepare version 7.0-SNAPSHOT
  Release 7.0
  SONAR-10384 No more possible to remove an email of a user
  SONAR-10296 Connection to PostgreSQL database fails if SOCKS proxy is enabled


Trivial merge