]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-4.4'
authorStas Vilchik <vilchiks@gmail.com>
Wed, 23 Jul 2014 12:03:42 +0000 (14:03 +0200)
committerStas Vilchik <vilchiks@gmail.com>
Wed, 23 Jul 2014 12:03:42 +0000 (14:03 +0200)
commit2a2294d055cc7f7cebb6f3f2138cd0637a646576
tree10bf56ee0abfd8a2e6c90235c81fe488da5f5f9e
parent3017f1dd753af8baa461cc9901f9d5a737a28946
parent4d828a37de90b1664855ab601836fbc931370102
Merge remote-tracking branch 'origin/branch-4.4'

Conflicts:
sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee
sonar-server/src/main/coffee/component-viewer/main.coffee
server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsShowAction.java
server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsShowActionTest.java
server/sonar-web/src/main/coffee/component-viewer/mixins/main-scm.coffee
server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs
sonar-core/src/main/resources/org/sonar/l10n/core.properties