]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d071a5c 99f2884)
Merge remote-tracking branch 'upstream/develop' into develop
authorMichael <heluecht@pirati.ca>
Fri, 27 Apr 2018 15:04:11 +0000 (15:04 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 27 Apr 2018 15:04:11 +0000 (15:04 +0000)

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