]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b638ed9 7094220)
Merge remote-tracking branch 'upstream/develop' into receive_participation
authorMichael <heluecht@pirati.ca>
Sat, 13 Jan 2018 00:18:41 +0000 (00:18 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 13 Jan 2018 00:18:41 +0000 (00:18 +0000)

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