]> source.dussan.org Git - sonarqube.git/commitdiff
Resolve merge conflicts
authorStas Vilchik <vilchiks@gmail.com>
Fri, 18 Jul 2014 06:50:51 +0000 (12:50 +0600)
committerStas Vilchik <vilchiks@gmail.com>
Fri, 18 Jul 2014 06:50:51 +0000 (12:50 +0600)

Trivial merge