You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 4ec907e413 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		6 years ago
..
audio_transcoder.rb	raise Mastodon::ValidationError if audio file duration is over 60 secs	7 years ago
gif_transcoder.rb	Fix static GIFs being saved as empty files when using local storage (#8012)	6 years ago
lazy_thumbnail.rb	Fix #3807: Increase avatars to 400x400 max (#6651)	7 years ago
video_transcoder.rb	Detect videos with no sound, handle them like gifv	8 years ago