]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54136f3 32c3762)
Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item
authorMichael <heluecht@pirati.ca>
Sun, 27 May 2018 10:38:49 +0000 (10:38 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 27 May 2018 10:38:49 +0000 (10:38 +0000)

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