projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2698bbc 21a73ce)
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)
#2192 Revert Rich Media censorship for sensitive statuses

See merge request pleroma/pleroma!3044


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git