From: ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Date: Fri, 3 Nov 2017 14:08:47 +0000 (+0100)
Subject: Automatic merge from branch-6.7
X-Git-Tag: 7.0-RC1~378
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=46c24fe4dfa047d7b14c55fc376f502daa3d6050;p=sonarqube.git

Automatic merge from branch-6.7

* origin/branch-6.7:
  Update wording of datacenter edition
---

46c24fe4dfa047d7b14c55fc376f502daa3d6050