|\|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|