]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 857469d f0c8543)
Merge remote-tracking branch 'upstream/master' into contact-discovery
authorMichael <heluecht@pirati.ca>
Mon, 24 Jun 2019 03:23:57 +0000 (03:23 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 24 Jun 2019 03:23:57 +0000 (03:23 +0000)

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