projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f27a731 21d27c2)
Merge pull request #3665 from annando/local-remote-user
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 28 Aug 2017 04:55:22 +0000 (06:55 +0200)
committerGitHub <noreply@github.com>
Mon, 28 Aug 2017 04:55:22 +0000 (06:55 +0200)
Bugfix: You cannot be local and remote at the same time


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