Merge pull request #8520 from annando/term2tag

author Hypolite Petovan <hypolite@mrpetovan.com>

Thu, 23 Apr 2020 02:56:07 +0000 (22:56 -0400)

committer GitHub <noreply@github.com>

Thu, 23 Apr 2020 02:56:07 +0000 (22:56 -0400)
author Hypolite Petovan <hypolite@mrpetovan.com>
Thu, 23 Apr 2020 02:56:07 +0000 (22:56 -0400)
committer GitHub <noreply@github.com>
Thu, 23 Apr 2020 02:56:07 +0000 (22:56 -0400)
diff --cc mod/photos.php
Simple merge
diff --cc src/Content/Text/BBCode.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Thu, 23 Apr 2020 02:56:07 +0000 (22:56 -0400)
committer	GitHub <noreply@github.com>
	Thu, 23 Apr 2020 02:56:07 +0000 (22:56 -0400)
		1	2
mod/photos.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Content/Text/BBCode.php	patch \|	diff1 \|	diff2 \|	blob \| history