]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42c2e09 0c65dbb)
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Häder <roland@mxchange.org>
Thu, 5 Jan 2017 07:56:05 +0000 (08:56 +0100)
committerRoland Häder <roland@mxchange.org>
Thu, 5 Jan 2017 07:56:05 +0000 (08:56 +0100)

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