mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-14 20:24:17 -05:00
bb6988a7ac
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb |
||
---|---|---|
.. | ||
audio_transcoder.rb | ||
gif_transcoder.rb | ||
lazy_thumbnail.rb | ||
video_transcoder.rb |