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

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