]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee015a2 363322b)
Merge pull request #3577 from annando/2in1
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 11 Jul 2017 06:31:39 +0000 (08:31 +0200)
committerGitHub <noreply@github.com>
Tue, 11 Jul 2017 06:31:39 +0000 (08:31 +0200)
Issue 3571 and Diaspora mail bugfix


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