From: lambda Date: Thu, 7 Jun 2018 14:44:08 +0000 (+0000) Subject: Merge branch 'feature/quarantine' into 'develop' X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=595ca3bb3a80eb3908a96b13c8b446296219a9c7;p=akkoma Merge branch 'feature/quarantine' into 'develop' add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer. See merge request pleroma/pleroma!199 --- 595ca3bb3a80eb3908a96b13c8b446296219a9c7