Automatic merge from branch-6.5

author ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>

Mon, 31 Jul 2017 14:02:47 +0000 (16:02 +0200)

committer ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>

Mon, 31 Jul 2017 14:02:47 +0000 (16:02 +0200)
author ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Mon, 31 Jul 2017 14:02:47 +0000 (16:02 +0200)
committer ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Mon, 31 Jul 2017 14:02:47 +0000 (16:02 +0200)
diff --cc server/sonar-web/src/main/js/apps/projectActivity/__tests__/__snapshots__/utils-test.js.snap
Simple merge
diff --cc server/sonar-web/src/main/js/apps/projectActivity/__tests__/utils-test.js
Simple merge
diff --cc server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityAnalysesList-test.js.snap
Simple merge
diff --cc server/sonar-web/src/main/js/apps/projectActivity/utils.js
Simple merge
author	ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
	Mon, 31 Jul 2017 14:02:47 +0000 (16:02 +0200)
committer	ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
	Mon, 31 Jul 2017 14:02:47 +0000 (16:02 +0200)
		1	2
server/sonar-web/src/main/js/apps/projectActivity/__tests__/__snapshots__/utils-test.js.snap	patch \|	diff1 \|	diff2 \|	blob \| history
server/sonar-web/src/main/js/apps/projectActivity/__tests__/utils-test.js	patch \|	diff1 \|	diff2 \|	blob \| history
server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityAnalysesList-test.js.snap	patch \|	diff1 \|	diff2 \|	blob \| history
server/sonar-web/src/main/js/apps/projectActivity/utils.js	patch \|	diff1 \|	diff2 \|	blob \| history