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

Merge branch 'master' into SONAR-4898 

Conflicts:
	server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
parents 9969f45f 86c81b2b
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