diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2014-10-14 10:16:08 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2014-10-14 10:16:08 +0200 |
| commit | bb621a7a349ddf4568d3ab592fe5a40d0297e6be (patch) | |
| tree | 0cf7ab245cb6487b134be7a93e6c5452730a10b2 /sonar-batch | |
| parent | d65c9957139e4b0da94f5cf797dfe98cfd62ce77 (diff) | |
| parent | 3ac8de59552f3d38f9b952079cbffa8572840731 (diff) | |
| download | sonarqube-bb621a7a349ddf4568d3ab592fe5a40d0297e6be.tar.gz sonarqube-bb621a7a349ddf4568d3ab592fe5a40d0297e6be.zip | |
Merge remote-tracking branch 'origin/branch-4.5'
Conflicts:
plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/XooPlugin.java
sonar-application/src/main/assembly/conf/sonar.properties
sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java
sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
Diffstat (limited to 'sonar-batch')
0 files changed, 0 insertions, 0 deletions