]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-5.0'
authorJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 9 Jan 2015 15:56:43 +0000 (16:56 +0100)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 9 Jan 2015 15:56:43 +0000 (16:56 +0100)
commit3f0b47d2b8a96a8465b2861eb8ce14cceefdb4b9
treec574eabe828e00a60785a75db7d41c8a50d84a3c
parent14e00a716f783b926027d57350b6c8a1af34748c
parentdbddd10fdd42d1a8b09c393a1a6a218affb4c646
Merge remote-tracking branch 'origin/branch-5.0'

Conflicts:
server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java
server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java
server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java
server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceMediumTest.java
sonar-core/src/main/resources/org/sonar/l10n/core.properties