]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-5.0'
authorStas Vilchik <vilchiks@gmail.com>
Mon, 22 Dec 2014 14:35:06 +0000 (15:35 +0100)
committerStas Vilchik <vilchiks@gmail.com>
Mon, 22 Dec 2014 14:35:06 +0000 (15:35 +0100)
commita068b8f33a3f94ee93b18379d4c3673c35202011
treed4950c4c739e1aeb9bae859a27a3f727e956d67c
parent2fbd58e01c8a87f89fad2690ec04c4300f4a73f3
parent7ea21fd06a448b1a38a0f8b262b600e6f6fb29fa
Merge remote-tracking branch 'origin/branch-5.0'

Conflicts:
server/sonar-web/src/main/js/tests/e2e/views/issues.jade
server/sonar-web/Gruntfile.coffee
server/sonar-web/src/main/coffee/issues/app-new.coffee
server/sonar-web/src/main/hbs/issues/issues-help.hbs
server/sonar-web/src/main/js/tests/e2e/views/issues.jade
server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb