Claire b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream ... Conflicts: - `spec/controllers/api/v1/timelines/tag_controller_spec.rb`: Glitch-soc had a few extra lines in this file to account for a different default setting. This file got replaced by `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc additions were moved too. Additional changes: - `spec/requests/api/v1/statuses/sources_spec.rb`: Add glitch-soc-only attribute `content_type`.		2023-10-17 21:35:07 +02:00
..
v1	Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream	2023-10-17 21:35:07 +02:00
v2	Migrate to request specs in /api/v2/filters (#25721)	2023-07-27 14:58:20 +02:00
web	Fix embed dropdown menu item for unauthenticated users (#25964)	2023-07-13 15:53:03 +02:00