Merge branch 'security/ir-generic-containment' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sun, 14 Jul 2019 19:24:39 +0000 (19:24 +0000)
committerkaniini <ariadne@dereferenced.org>
Sun, 14 Jul 2019 19:24:39 +0000 (19:24 +0000)
commit509d8058d99d7455155b6e7fad83fed28f2ae02d
tree443d91b209b67e793da420c6bcc913eff9201d59
parent93701c3399add8af2d4a5d43b6f171d84655a533
parent841314c2d504ad108f6a85713546b188096ad735
Merge branch 'security/ir-generic-containment' into 'develop'

security: IR-based generic object containment

See merge request pleroma/pleroma!1417