diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-03 15:34:33 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-03 15:34:33 +0200 |
| commit | 72e5ccaf03bb37e407ec0e0e4c7253f5060708da (patch) | |
| tree | af3cf2395927df2addbab58a9668a196d6f1a83f /sonar-plugin-api | |
| parent | 0d797dd4a916a5d093e65fa25d5c14d618f9e92a (diff) | |
| parent | 3406907abc194c2a665539f49cea1a16f877e667 (diff) | |
| download | sonarqube-72e5ccaf03bb37e407ec0e0e4c7253f5060708da.tar.gz sonarqube-72e5ccaf03bb37e407ec0e0e4c7253f5060708da.zip | |
Merge remote-tracking branch 'origin/branch-4.5'
Conflicts:
server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
server/sonar-server/src/main/java/org/sonar/server/search/Result.java
server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexMediumTest.java
Diffstat (limited to 'sonar-plugin-api')
0 files changed, 0 insertions, 0 deletions