]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 427881c 97f07b7)
Merge remote-tracking branch 'upstream/develop' into relayed-dfrn-dspr
authorMichael <heluecht@pirati.ca>
Thu, 1 Oct 2020 21:24:35 +0000 (21:24 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 1 Oct 2020 21:24:35 +0000 (21:24 +0000)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.