Commit a9609838 authored by lain's avatar lain
Browse files

Merge branch 'security/actor-containment' into 'develop'

security hotfix: actor containment

See merge request pleroma/pleroma!460
parents 05967472 b483ae0a
Pipeline #4535 passed with stages
in 7 minutes and 16 seconds