Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x		2018-07-16 14:50:42 +02:00
..
audio_transcoder.rb	raise Mastodon::ValidationError if audio file duration is over 60 secs	2017-10-07 16:14:34 -07:00
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	Fix #3807: Increase avatars to 400x400 max (#6651)	2018-03-06 06:29:01 +01:00
video_transcoder.rb	Detect videos with no sound, handle them like gifv	2017-03-05 22:55:24 +01:00