https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 155d541 bdf1e7e)
Merge pull request #7095 from annando/ap-connect
authorHypolite Petovan <hypolite@mrpetovan.com>
Sun, 5 May 2019 13:37:43 +0000 (09:37 -0400)
committerGitHub <noreply@github.com>
Sun, 5 May 2019 13:37:43 +0000 (09:37 -0400)
Switching from legacy DFRN connect to ActivityPub

1  2 
mod/follow.php patch | diff1 | diff2 | blob | history
src/Model/Contact.php patch | diff1 | diff2 | blob | history

diff --cc mod/follow.php
Simple merge
diff --cc src/Model/Contact.php
Simple merge
mirror https://github.com/friendica/friendica.git