kyori19 ae2190b9a5 Merge remote-tracking branch 'mastodon/main' into custom/quote ...

# Conflicts:
#	app/javascript/mastodon/components/status.js
#	app/javascript/mastodon/components/status_action_bar.js
#	app/javascript/mastodon/components/status_content.js
#	app/javascript/mastodon/containers/timeline_container.js
#	app/javascript/mastodon/features/status/components/detailed_status.js
#	app/javascript/styles/mastodon/components.scss

2022-11-15 01:48:20 +00:00

..

v1

Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-15 01:48:20 +00:00

v2

Move V2 Filter methods under /api/v2 prefix (#20622)

2022-11-14 08:34:07 +01:00

web

Refactor formatter (#17828)

2022-03-26 02:53:34 +01:00

base_controller.rb

Fix error when passing unknown filter param in REST API (#20626)

2022-11-14 08:06:06 +01:00

oembed_controller.rb

Fix OEmbed leaking information about existence of non-public statuses (#12930)

2020-01-24 00:20:51 +01:00