diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-15 08:25:10 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-17 19:50:23 +0300 |
| commit | 0465bdbd49ad729e9aec0b3f330607386f433d5d (patch) | |
| tree | 431a251c976a377797e3100abc91ce869d685f2f /priv | |
| parent | bb70b231d023c6e9f998a6be58f66ae3ff603157 (diff) | |
| download | pleroma-0465bdbd49ad729e9aec0b3f330607386f433d5d.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 'priv')
0 files changed, 0 insertions, 0 deletions