Merge pull request #5800 from JonnyTischbein/issue_return_path

author Hypolite Petovan <hypolite@mrpetovan.com>

Tue, 2 Oct 2018 16:30:38 +0000 (12:30 -0400)

committer GitHub <noreply@github.com>

Tue, 2 Oct 2018 16:30:38 +0000 (12:30 -0400)
author Hypolite Petovan <hypolite@mrpetovan.com>
Tue, 2 Oct 2018 16:30:38 +0000 (12:30 -0400)
committer GitHub <noreply@github.com>
Tue, 2 Oct 2018 16:30:38 +0000 (12:30 -0400)
diff --cc mod/contacts.php
Simple merge
diff --cc mod/message.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Tue, 2 Oct 2018 16:30:38 +0000 (12:30 -0400)
committer	GitHub <noreply@github.com>
	Tue, 2 Oct 2018 16:30:38 +0000 (12:30 -0400)
		1	2
mod/contacts.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/message.php	patch \|	diff1 \|	diff2 \|	blob \| history