]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e2b62b efbdb57)
Merge pull request #1947 from annando/1510-diaspora-follower
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 10 Oct 2015 16:50:20 +0000 (18:50 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 10 Oct 2015 16:50:20 +0000 (18:50 +0200)
Reworked contact relations between Diaspora and Friendica

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.