Skip to content
Commit eaa3705f authored by Simon Brandhof's avatar Simon Brandhof
Browse files

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

Conflicts:
	sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
parents 0cfffa2b 27437f40
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