]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96e36b6 a5e9117)
Merge remote-tracking branch 'upstream/develop' into develop
authorAndyHee <andy@hubup.pro>
Thu, 30 Nov 2017 07:01:18 +0000 (14:01 +0700)
committerAndyHee <andy@hubup.pro>
Thu, 30 Nov 2017 07:01:18 +0000 (14:01 +0700)

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