Merge pull request #3544 from fatalbanana/tp

author Vsevolod Stakhov <vsevolod@highsecure.ru>

Thu, 5 Nov 2020 15:09:34 +0000 (15:09 +0000)

committer GitHub <noreply@github.com>

Thu, 5 Nov 2020 15:09:34 +0000 (15:09 +0000)
author Vsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 5 Nov 2020 15:09:34 +0000 (15:09 +0000)
committer GitHub <noreply@github.com>
Thu, 5 Nov 2020 15:09:34 +0000 (15:09 +0000)
diff --cc test/functional/cases/109_composites.robot
Simple merge
author	Vsevolod Stakhov <vsevolod@highsecure.ru>
	Thu, 5 Nov 2020 15:09:34 +0000 (15:09 +0000)
committer	GitHub <noreply@github.com>
	Thu, 5 Nov 2020 15:09:34 +0000 (15:09 +0000)