]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 356a2a9 02a1b4e)
Merge remote-tracking branch 'upstream/develop' into blocked-server
authorMichael <heluecht@pirati.ca>
Tue, 17 Jan 2023 19:25:09 +0000 (19:25 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 17 Jan 2023 19:25:09 +0000 (19:25 +0000)

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