]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5afedb2 1752dfe)
Merge remote-tracking branch 'upstream/develop' into community
authorMichael <heluecht@pirati.ca>
Wed, 3 Jan 2018 01:15:27 +0000 (01:15 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 3 Jan 2018 01:15:27 +0000 (01:15 +0000)
1  2 
include/conversation.php patch | diff1 | diff2 | blob | history

diff --cc include/conversation.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.