https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: acd99b9 dd613cd)
Merge remote-tracking branch 'upstream/develop' into push-pull
authorMichael <heluecht@pirati.ca>
Tue, 3 Mar 2020 06:55:13 +0000 (06:55 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 3 Mar 2020 06:55:13 +0000 (06:55 +0000)
1  2 
src/Protocol/ActivityPub/Processor.php patch | diff1 | diff2 | blob | history
src/Protocol/ActivityPub/Receiver.php patch | diff1 | diff2 | blob | history

diff --cc src/Protocol/ActivityPub/Receiver.php
Simple merge
mirror https://github.com/friendica/friendica.git