source.dussan.org Git - sonarqube.git/commit

]> source.dussan.org Git - sonarqube.git/commit

projects / sonarqube.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 03970ea b0903c3)

author	Julien Lancelot <julien.lancelot@sonarsource.com>
	Thu, 9 Oct 2014 13:05:37 +0000 (15:05 +0200)
committer	Julien Lancelot <julien.lancelot@sonarsource.com>
	Thu, 9 Oct 2014 13:05:37 +0000 (15:05 +0200)
commit	393f9888e69e209b2755aebaed3709a167399b29
tree	a92d790a9cc7ad42691250de7a4fe4c52346f75b	tree \| snapshot
parent	03970eafff028da26540ef814619a02168a57618	commit \| diff
parent	b0903c3790a72643840e147501a739604e3083de	commit \| diff

Fix merge with 4.5

server/sonar-server/src/main/java/org/sonar/server/db/migrations/DatabaseMigrations.java	diff1 \|	diff2 \|	blob \| history
server/sonar-server/src/main/resources/org/sonar/server/design/file_design.html.erb	diff1 \|	\|	blob \| history
server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java	diff1 \|	diff2 \|	blob \| history
server/sonar-web/src/main/less/style.less	diff1 \|	diff2 \|	blob \| history
server/sonar-web/src/main/less/ui.less	diff1 \|	diff2 \|	blob \| history
sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java	diff1 \|	diff2 \|	blob \| history
sonar-core/src/main/java/org/sonar/core/rule/RuleParamDto.java	diff1 \|	diff2 \|	blob \| history
sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql	diff1 \|	diff2 \|	blob \| history
sonar-core/src/main/resources/org/sonar/l10n/core.properties	diff1 \|	diff2 \|	blob \| history

Continuous Inspection: https://github.com/SonarSource/sonarqube