Merge pull request #5794 from annando/ap1

author Hypolite Petovan <hypolite@mrpetovan.com>

Tue, 2 Oct 2018 15:24:04 +0000 (11:24 -0400)

committer GitHub <noreply@github.com>

Tue, 2 Oct 2018 15:24:04 +0000 (11:24 -0400)
author Hypolite Petovan <hypolite@mrpetovan.com>
Tue, 2 Oct 2018 15:24:04 +0000 (11:24 -0400)
committer GitHub <noreply@github.com>
Tue, 2 Oct 2018 15:24:04 +0000 (11:24 -0400)
diff --cc include/api.php
Simple merge
diff --cc include/conversation.php
Simple merge
diff --cc index.php
Simple merge
diff --cc mod/admin.php
Simple merge
diff --cc mod/contacts.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Tue, 2 Oct 2018 15:24:04 +0000 (11:24 -0400)
committer	GitHub <noreply@github.com>
	Tue, 2 Oct 2018 15:24:04 +0000 (11:24 -0400)
		1	2
include/api.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/contacts.php	patch \|	diff1 \|	diff2 \|	blob \| history