]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-4.5'
authorJulien Lancelot <julien.lancelot@sonarsource.com>
Wed, 5 Nov 2014 15:21:28 +0000 (16:21 +0100)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Wed, 5 Nov 2014 15:21:28 +0000 (16:21 +0100)
commit3ad61ba840c9864221235fab3824348cd8ee79db
tree343e22b1043597d419c7b4728b27cc6f6bc35212
parent1116951df8188cb5e6735a31bfa3255ee690ee5c
parentaf66bd7b20a5efb5f6f2b73c0fe2adcad93b59b6
Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java
server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java