]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad5c263 f9fd263)
Merge remote-tracking branch 'upstream/develop' into develop
authorMichael <heluecht@pirati.ca>
Wed, 6 Dec 2017 14:56:34 +0000 (14:56 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 6 Dec 2017 14:56:34 +0000 (14:56 +0000)

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