Merge pull request #6013 from JonnyTischbein/issue_comment_media_link_prompt

author Hypolite Petovan <hypolite@mrpetovan.com>

Wed, 24 Oct 2018 16:17:58 +0000 (12:17 -0400)

committer GitHub <noreply@github.com>

Wed, 24 Oct 2018 16:17:58 +0000 (12:17 -0400)
author Hypolite Petovan <hypolite@mrpetovan.com>
Wed, 24 Oct 2018 16:17:58 +0000 (12:17 -0400)
committer GitHub <noreply@github.com>
Wed, 24 Oct 2018 16:17:58 +0000 (12:17 -0400)
diff --cc include/conversation.php
Simple merge
diff --cc mod/parse_url.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Wed, 24 Oct 2018 16:17:58 +0000 (12:17 -0400)
committer	GitHub <noreply@github.com>
	Wed, 24 Oct 2018 16:17:58 +0000 (12:17 -0400)
		1	2
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/parse_url.php	patch \|	diff1 \|	diff2 \|	blob \| history