From: ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Date: Mon, 5 Feb 2018 07:01:12 +0000 (+0100)
Subject: Automatic merge from branch-7.0
X-Git-Tag: 7.5~1745
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bf512ec601e12a5b0705c6f02d58a24812f8aef3;p=sonarqube.git

Automatic merge from branch-7.0

* 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
---

bf512ec601e12a5b0705c6f02d58a24812f8aef3