]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0eecfc c4db9ed)
Merge remote-tracking branch 'upstream/develop' into develop
authorMichael <heluecht@pirati.ca>
Thu, 11 Jan 2018 22:51:53 +0000 (22:51 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 11 Jan 2018 22:51:53 +0000 (22:51 +0000)

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