Merge branch 'revert/rich-media-censorship' into 'develop'
authorfeld <feld@feld.me>
Tue, 6 Oct 2020 20:19:39 +0000 (20:19 +0000)
committerfeld <feld@feld.me>
Tue, 6 Oct 2020 20:19:39 +0000 (20:19 +0000)
commitf9ece1a7f65dc13a867c40ccf08f8973e822e6f2
treecb627ee53fc7726018bc2a1afec211195bfddd00
parent2698bbc9f63d0bfd59de182d361db03d54aa2a68
parent21a73ce9f2c577c046e1cd17ef1a2b6636d01585
Merge branch 'revert/rich-media-censorship' into 'develop'

#2192 Revert Rich Media censorship for sensitive statuses

See merge request pleroma/pleroma!3044