]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e46382 dd0147b)
Merge remote-tracking branch 'upstream/develop' into better-resource-id
authorMichael <heluecht@pirati.ca>
Wed, 21 Feb 2018 03:28:47 +0000 (03:28 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 21 Feb 2018 03:28:47 +0000 (03:28 +0000)

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