]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4957ab8 33a5512)
Merge remote-tracking branch 'upstream/develop' into reworked-delivery
authorMichael <heluecht@pirati.ca>
Thu, 26 Apr 2018 20:42:57 +0000 (20:42 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 26 Apr 2018 20:42:57 +0000 (20:42 +0000)

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