From: Dessalines <dessalines@users.noreply.github.com>
Date: Thu, 8 Oct 2020 18:51:04 +0000 (-0400)
Subject: Merge pull request #1180 from LemmyNet/no_conflict_triggers
X-Git-Url: http://these/git/%22%7Burl%7D/%7B%60https:/%24%7Bi.domain%7D%60%7D?a=commitdiff_plain;h=8d0580461b061d6e0f2dca749862c9a631d1bcda;p=lemmy.git

Merge pull request #1180 from LemmyNet/no_conflict_triggers

No send blocked and no conflict triggers
---

8d0580461b061d6e0f2dca749862c9a631d1bcda