]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bca1dc1 5e4ace2)
Merge remote-tracking branch 'upstream/develop' into contact-discovery
authorMichael <heluecht@pirati.ca>
Mon, 24 Jun 2019 05:41:10 +0000 (05:41 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 24 Jun 2019 05:41:10 +0000 (05:41 +0000)

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