Merge pull request #11015 from MrPetovan/task/10979-frio-time-tooltip

author Michael Vogel <icarus@dabo.de>

Mon, 22 Nov 2021 11:45:29 +0000 (12:45 +0100)

committer GitHub <noreply@github.com>

Mon, 22 Nov 2021 11:45:29 +0000 (12:45 +0100)
author Michael Vogel <icarus@dabo.de>
Mon, 22 Nov 2021 11:45:29 +0000 (12:45 +0100)
committer GitHub <noreply@github.com>
Mon, 22 Nov 2021 11:45:29 +0000 (12:45 +0100)
diff --cc view/theme/frio/templates/search_item.tpl
Simple merge
diff --cc view/theme/frio/templates/wall_thread.tpl
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Mon, 22 Nov 2021 11:45:29 +0000 (12:45 +0100)
committer	GitHub <noreply@github.com>
	Mon, 22 Nov 2021 11:45:29 +0000 (12:45 +0100)
		1	2
view/theme/frio/templates/search_item.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/frio/templates/wall_thread.tpl	patch \|	diff1 \|	diff2 \|	blob \| history