]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ab697e 51a070e)
Merge remote-tracking branch 'upstream/develop' into json-webfinger
authorMichael <heluecht@pirati.ca>
Wed, 30 Aug 2017 06:22:02 +0000 (06:22 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 30 Aug 2017 06:22:02 +0000 (06:22 +0000)

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