]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6998897 d990f9b)
Merge remote-tracking branch 'upstream/develop' into pleroma2
authorMichael <heluecht@pirati.ca>
Thu, 24 Aug 2017 06:26:58 +0000 (06:26 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 24 Aug 2017 06:26:58 +0000 (06:26 +0000)

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