Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 15 Sep 2020 08:25:10 +0000 (08:25 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 15 Sep 2020 08:25:10 +0000 (08:25 +0000)
commit5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe
tree92f0c2dc990f8beb5040a2f280d056d690e952ea
parent39d769f25057dbaf89dc23d39941780bc65c2b06
parent0b66e806e32055b625560eb06b9300cc856f9789
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'

Ensure we only apply media_nsfw simple policy on parsable objects

Closes #2133

See merge request pleroma/pleroma!2992
CHANGELOG.md