]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 947a1b8 ab90bd2)
Merge remote-tracking branch 'upstream/develop' into item-delete
authorMichael <heluecht@pirati.ca>
Wed, 17 Jan 2018 21:54:17 +0000 (21:54 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 17 Jan 2018 21:54:17 +0000 (21:54 +0000)

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