From: ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Date: Thu, 25 Jan 2018 07:01:15 +0000 (+0100)
Subject: Automatic merge from branch-7.0
X-Git-Tag: 7.5~1793
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F2981%2Fhead;p=sonarqube.git

Automatic merge from branch-7.0

* origin/branch-7.0:
  Set version 7.0-SNAPSHOT
  Release 7.0-RC1
---

aac261daaa04173dc048a683e219313f4f14e3d0