From: ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Date: Thu, 11 Jan 2018 07:01:03 +0000 (+0100)
Subject: Automatic merge from branch-6.7
X-Git-Tag: 7.0-RC1~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=943f2d716bc135696f53047a550d66d256aceebf;p=sonarqube.git

Automatic merge from branch-6.7

* origin/branch-6.7:
  SONAR-10258 Missing information about uncovered conditions on a line
  SONAR-10236 Cannot bulk activate/deactivate rules when using a web context
---

943f2d716bc135696f53047a550d66d256aceebf