Merge pull request #9334 from annando/endless-scroll

author Philipp <admin+Github@philipp.info>

Thu, 1 Oct 2020 21:04:56 +0000 (23:04 +0200)

committer GitHub <noreply@github.com>

Thu, 1 Oct 2020 21:04:56 +0000 (23:04 +0200)
author Philipp <admin+Github@philipp.info>
Thu, 1 Oct 2020 21:04:56 +0000 (23:04 +0200)
committer GitHub <noreply@github.com>
Thu, 1 Oct 2020 21:04:56 +0000 (23:04 +0200)
diff --cc include/conversation.php
Simple merge
diff --cc src/Model/Contact.php
Simple merge
author	Philipp <admin+Github@philipp.info>
	Thu, 1 Oct 2020 21:04:56 +0000 (23:04 +0200)
committer	GitHub <noreply@github.com>
	Thu, 1 Oct 2020 21:04:56 +0000 (23:04 +0200)
		1	2
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Model/Contact.php	patch \|	diff1 \|	diff2 \|	blob \| history