Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2022-11-12 13:28:03 +01:00
..
attachment_extensions.rb
blurhash_transcoder.rb
color_extractor.rb
gif_transcoder.rb
image_extractor.rb
lazy_thumbnail.rb
response_with_limit_adapter.rb
transcoder.rb
type_corrector.rb
url_generator_extensions.rb