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	add env var for max length of audio uploads	2019-04-16 16:07:20 +02:00
blurhash_transcoder.rb
gif_transcoder.rb	Fix static GIFs being saved as empty files when using local storage (#8012)	2018-07-14 03:56:52 +02:00
lazy_thumbnail.rb
video_transcoder.rb