Merge pull request #8293 from MrPetovan/task/5562-community-pagination

author Philipp <admin+Github@philipp.info>

Sun, 16 Feb 2020 18:38:49 +0000 (19:38 +0100)

committer GitHub <noreply@github.com>

Sun, 16 Feb 2020 18:38:49 +0000 (19:38 +0100)
author Philipp <admin+Github@philipp.info>
Sun, 16 Feb 2020 18:38:49 +0000 (19:38 +0100)
committer GitHub <noreply@github.com>
Sun, 16 Feb 2020 18:38:49 +0000 (19:38 +0100)
diff --cc include/conversation.php
Simple merge
diff --cc mod/settings.php
Simple merge
diff --cc src/Model/Contact.php
Simple merge
diff --cc src/Module/Profile/Status.php
Simple merge
author	Philipp <admin+Github@philipp.info>
	Sun, 16 Feb 2020 18:38:49 +0000 (19:38 +0100)
committer	GitHub <noreply@github.com>
	Sun, 16 Feb 2020 18:38:49 +0000 (19:38 +0100)
		1	2
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Model/Contact.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Module/Profile/Status.php	patch \|	diff1 \|	diff2 \|	blob \| history