]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9daecb 51dca9b)
Merge pull request #3642 from annando/pleroma
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 22 Aug 2017 06:40:36 +0000 (08:40 +0200)
committerGitHub <noreply@github.com>
Tue, 22 Aug 2017 06:40:36 +0000 (08:40 +0200)
Compatibility with pleroma added


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