]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f98c80 5a72d75)
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Haeder <roland@mxchange.org>
Wed, 21 Dec 2016 18:59:38 +0000 (19:59 +0100)
committerRoland Haeder <roland@mxchange.org>
Wed, 21 Dec 2016 18:59:38 +0000 (19:59 +0100)

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