]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d6953b 1afb49f)
Merge remote-tracking branch 'upstream/develop' into ap-stuff
authorMichael <heluecht@pirati.ca>
Thu, 5 Mar 2020 20:23:00 +0000 (20:23 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 5 Mar 2020 20:23:00 +0000 (20:23 +0000)

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