]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5a0ff9 57cd063)
Merge remote-tracking branch 'upstream/develop' into term2tag
authorMichael <heluecht@pirati.ca>
Wed, 15 Apr 2020 11:31:52 +0000 (11:31 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 15 Apr 2020 11:31:52 +0000 (11:31 +0000)
1  2 
src/Protocol/DFRN.php patch | diff1 | diff2 | blob | history
src/Protocol/Diaspora.php patch | diff1 | diff2 | blob | history

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