nachtjasmin 4033d28160 Merge tag 'v4.2.0-rc1' into lets-bump-hometown-to-mastodon-4.2 ... Conflict resolution: - app/javascript/mastodon/features/compose/components/search_results.jsx: taken as is - app/models/account.rb: use upstream SQL queries for filtering - app/models/media_attachment.rb: use upstream ffmpeg settings - config/locales/de.yml: merged		2023-11-18 16:55:55 +01:00
..
actions	Fix haml-lint rubocop style negation cops (#26057)	2023-07-18 17:02:02 +02:00
_actions.html.haml	Add confirmation screen when handling reports (#22375)	2023-01-18 16:40:09 +01:00
_media_attachments.html.haml	Fix video player not being displayed in reports interface (#26801)	2023-09-05 20:05:58 +02:00
_status.html.haml	Merge tag 'v4.0.0' into hometown-4.0-merge	2022-11-16 20:54:49 -08:00
index.html.haml	Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (#26039)	2023-07-20 17:03:39 +02:00
show.html.haml	Consolidate inclusion of `admin` js pack link (#26628)	2023-08-24 09:56:23 +02:00