]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc4a2ae 0472c7b)
Merge remote-tracking branch 'upstream/develop' into diasppora-delivery
authorMichael <heluecht@pirati.ca>
Mon, 5 Nov 2018 19:46:59 +0000 (19:46 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 5 Nov 2018 19:46:59 +0000 (19:46 +0000)

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