mastodon/lib/paperclip
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
..
audio_transcoder.rb
blurhash_transcoder.rb
gif_transcoder.rb
lazy_thumbnail.rb
video_transcoder.rb