]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c8e834 ca734f1)
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Haeder <roland@mxchange.org>
Fri, 23 Dec 2016 17:57:41 +0000 (18:57 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 23 Dec 2016 17:57:41 +0000 (18:57 +0100)
Signed-off-by: Roland Haeder <roland@mxchange.org>

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