diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-15 08:25:10 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-15 08:25:10 +0000 |
commit | 5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe (patch) | |
tree | 92f0c2dc990f8beb5040a2f280d056d690e952ea /uploads | |
parent | 39d769f25057dbaf89dc23d39941780bc65c2b06 (diff) | |
parent | 0b66e806e32055b625560eb06b9300cc856f9789 (diff) | |
download | pleroma-5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe.tar.gz |
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
Diffstat (limited to 'uploads')
0 files changed, 0 insertions, 0 deletions