Merge branch 'branch-6.7'

author Sébastien Lesaint <sebastien.lesaint@sonarsource.com>

Wed, 17 Jan 2018 15:38:05 +0000 (16:38 +0100)

committer Sébastien Lesaint <sebastien.lesaint@sonarsource.com>

Wed, 17 Jan 2018 15:38:05 +0000 (16:38 +0100)
author Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Wed, 17 Jan 2018 15:38:05 +0000 (16:38 +0100)
committer Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Wed, 17 Jan 2018 15:38:05 +0000 (16:38 +0100)
diff --cc server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplate.java
Simple merge
diff --cc server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplateTest.java
Simple merge
author	Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
	Wed, 17 Jan 2018 15:38:05 +0000 (16:38 +0100)
committer	Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
	Wed, 17 Jan 2018 15:38:05 +0000 (16:38 +0100)
		1	2
server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplate.java	patch \|	diff1 \|	diff2 \|	blob \| history
server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/SupportPrivateProjectInDefaultPermissionTemplateTest.java	patch \|	diff1 \|	diff2 \|	blob \| history