Merge pull request #8740 from MrPetovan/task/frio-improve-share-display

author Michael Vogel <icarus@dabo.de>

Thu, 11 Jun 2020 05:32:29 +0000 (07:32 +0200)

committer GitHub <noreply@github.com>

Thu, 11 Jun 2020 05:32:29 +0000 (07:32 +0200)
author Michael Vogel <icarus@dabo.de>
Thu, 11 Jun 2020 05:32:29 +0000 (07:32 +0200)
committer GitHub <noreply@github.com>
Thu, 11 Jun 2020 05:32:29 +0000 (07:32 +0200)
diff --cc mod/item.php
Simple merge
diff --cc src/Network/Probe.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Thu, 11 Jun 2020 05:32:29 +0000 (07:32 +0200)
committer	GitHub <noreply@github.com>
	Thu, 11 Jun 2020 05:32:29 +0000 (07:32 +0200)
		1	2
mod/item.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Network/Probe.php	patch \|	diff1 \|	diff2 \|	blob \| history