diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-06-07 14:44:08 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-06-07 14:44:08 +0000 |
commit | 595ca3bb3a80eb3908a96b13c8b446296219a9c7 (patch) | |
tree | 0895db9662441f0e169586de33fd2e291a867a1e /lib/xml_builder.ex | |
parent | b114808a10548a2b77bebbecae13ba94e8c2a3a6 (diff) | |
parent | 09604182d0ea4c8bdc2f9aa0337dd45183fe6a92 (diff) | |
download | pleroma-595ca3bb3a80eb3908a96b13c8b446296219a9c7.tar.gz |
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
Diffstat (limited to 'lib/xml_builder.ex')
0 files changed, 0 insertions, 0 deletions