projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b114808 0960418)
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)
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.

See merge request pleroma/pleroma!199


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git