Skip to content
Commit 041d9e31 authored by Stephane Gamard's avatar Stephane Gamard
Browse files

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

Conflicts:
	server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java
parents ea978ffd 7e9c9bbe
Hide whitespace changes
Inline Side-by-side
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