]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into public-redir
authorMichael <heluecht@pirati.ca>
Fri, 1 Jun 2018 12:32:51 +0000 (12:32 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 1 Jun 2018 12:32:51 +0000 (12:32 +0000)
1  2 
include/conversation.php

Simple merge