]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ea1e18 c3a8d55)
Merge remote-tracking branch 'upstream/develop' into develop
authorMichael <heluecht@pirati.ca>
Sun, 5 Apr 2020 12:35:57 +0000 (12:35 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 5 Apr 2020 12:35:57 +0000 (12:35 +0000)

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