Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
authorlain <lain@soykaf.club>
Sun, 15 Mar 2020 19:15:20 +0000 (19:15 +0000)
committerlain <lain@soykaf.club>
Sun, 15 Mar 2020 19:15:20 +0000 (19:15 +0000)
commitfa4ec17c841a65eccacdc35c98b6c047549b305b
tree3ad0309f22b8cb7183cc73b0f2869b5db8e2351d
parentd84670b9e15e15797c985269664cdf081237eac4
parentecb7809e92b8ee6ac8f4b4a812673684e762c215
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'

[#1560] Restricted AP- & OStatus-related routes for non-federating instances

Closes #1560

See merge request pleroma/pleroma!2235