Skip to content
Commit f32ae830 authored by Julien Lancelot's avatar Julien Lancelot
Browse files

Merge remote-tracking branch 'origin/branch-5.0'

Conflicts:
	server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java
	server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java
	server/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java
	sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ActiveRule.java
	sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesMediumTest.java
	sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnDirMediumTest.java
parents 3dcf41ab b49f4a0e
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment