Claire ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly.		2025-01-14 20:38:32 +01:00
..
v1	Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream	2025-01-14 20:38:32 +01:00
v2	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00
web	Add support for standard webpush (#33528)	2025-01-14 09:14:00 +00:00
base_controller.rb	Add endpoints for unread notifications count (#31191)	2024-07-30 08:39:11 +00:00
oembed_controller.rb	Move default embed size knowledge into `OEmbedSerializer` (#31990)	2024-09-20 12:39:48 +00:00