]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-4.5'
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Mon, 22 Sep 2014 07:15:12 +0000 (09:15 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Mon, 22 Sep 2014 07:15:12 +0000 (09:15 +0200)
commita80f40412e5af30dc6ea23c57fe30d6a3cbf2034
tree87c5cdc789c018143ef1099d3ffd4ebeeb523766
parente91859fc277ed458a180201c7fa128822661cde8
parentbbca1b8de515423e6fd0d7e93e0d2f49e82dd7ba
Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
sonar-application/src/main/assembly/conf/sonar.properties