Merge branch 'feature/quarantine' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 7 Jun 2018 14:44:08 +0000 (14:44 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 7 Jun 2018 14:44:08 +0000 (14:44 +0000)
commit595ca3bb3a80eb3908a96b13c8b446296219a9c7
tree0895db9662441f0e169586de33fd2e291a867a1e
parentb114808a10548a2b77bebbecae13ba94e8c2a3a6
parent09604182d0ea4c8bdc2f9aa0337dd45183fe6a92
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