Claire 2f491f0d48 Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6 ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version.
   Did it as well.

2026-06-23 18:01:59 +02:00

..

chewy

…

controllers

Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6

2026-06-23 18:01:59 +02:00

helpers

Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream

2026-06-09 21:30:54 +02:00

inputs

…

javascript

Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6

2026-06-23 18:01:59 +02:00

lib

Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream

2026-06-09 21:30:54 +02:00

mailers

fixes bug Admin Mailer trends mail not displayed correctly (#39122)

2026-05-28 20:14:31 +00:00

models

Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6

2026-06-23 18:01:59 +02:00

policies

Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream

2026-06-09 21:30:54 +02:00

presenters

Add export for custom filters (#39085)

2026-06-01 09:56:17 +00:00

serializers

Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6

2026-06-16 21:49:17 +02:00

services

Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6

2026-06-23 18:01:59 +02:00

validators

Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream

2026-06-09 21:30:54 +02:00

views

Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream

2026-06-12 18:37:02 +02:00

workers

Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6

2026-06-23 18:01:59 +02:00