mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 05:08:03 +00:00
44a5f1b64a
Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README |
||
---|---|---|
.. | ||
attachment_extensions.rb | ||
blurhash_transcoder.rb | ||
color_extractor.rb | ||
gif_transcoder.rb | ||
image_extractor.rb | ||
lazy_thumbnail.rb | ||
media_type_spoof_detector_extensions.rb | ||
response_with_limit_adapter.rb | ||
transcoder.rb | ||
type_corrector.rb | ||
url_generator_extensions.rb |