Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

author Michael <heluecht@pirati.ca>

Sat, 22 Sep 2018 15:18:53 +0000 (15:18 +0000)

committer Michael <heluecht@pirati.ca>

Sat, 22 Sep 2018 15:18:53 +0000 (15:18 +0000)
author Michael <heluecht@pirati.ca>
Sat, 22 Sep 2018 15:18:53 +0000 (15:18 +0000)
committer Michael <heluecht@pirati.ca>
Sat, 22 Sep 2018 15:18:53 +0000 (15:18 +0000)
diff --cc composer.json
Simple merge
diff --cc composer.lock
Simple merge
diff --cc include/conversation.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Sat, 22 Sep 2018 15:18:53 +0000 (15:18 +0000)
committer	Michael <heluecht@pirati.ca>
	Sat, 22 Sep 2018 15:18:53 +0000 (15:18 +0000)
		1	2
composer.json	patch \|	diff1 \|	diff2 \|	blob \| history
composer.lock	patch \|	diff1 \|	diff2 \|	blob \| history
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history