https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc9074b c6dbbe2)
Merge pull request #3764 from annando/contact-blocked
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 7 Oct 2017 13:10:39 +0000 (13:10 +0000)
committerGitHub <noreply@github.com>
Sat, 7 Oct 2017 13:10:39 +0000 (13:10 +0000)
Preparation for the possibility to globally block contacts


Trivial merge
mirror https://github.com/friendica/friendica.git