mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-25 14:46:46 +00:00
c48ec9cb8c
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
---|---|---|
.. | ||
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 |