Merge pull request #8277 from MrPetovan/task/8251-use-about-for-pdesc

author Michael Vogel <icarus@dabo.de>

Wed, 12 Feb 2020 04:23:04 +0000 (05:23 +0100)

committer GitHub <noreply@github.com>

Wed, 12 Feb 2020 04:23:04 +0000 (05:23 +0100)
author Michael Vogel <icarus@dabo.de>
Wed, 12 Feb 2020 04:23:04 +0000 (05:23 +0100)
committer GitHub <noreply@github.com>
Wed, 12 Feb 2020 04:23:04 +0000 (05:23 +0100)
diff --cc mod/cal.php
Simple merge
diff --cc mod/common.php
Simple merge
diff --cc mod/photos.php
Simple merge
diff --cc mod/videos.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Wed, 12 Feb 2020 04:23:04 +0000 (05:23 +0100)
committer	GitHub <noreply@github.com>
	Wed, 12 Feb 2020 04:23:04 +0000 (05:23 +0100)
		1	2
mod/cal.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/common.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/photos.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/videos.php	patch \|	diff1 \|	diff2 \|	blob \| history