]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 713bdb4 961a6d2)
Merge remote-tracking branch 'upstream/develop' into dfrn-reshare
authorMichael <heluecht@pirati.ca>
Wed, 18 Apr 2018 03:12:13 +0000 (03:12 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 18 Apr 2018 03:12:13 +0000 (03:12 +0000)
1  2 
src/Protocol/Diaspora.php patch | diff1 | diff2 | blob | history

diff --cc src/Protocol/Diaspora.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.