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

..

activity.rb

…

confirmation.rb

…

has_settings.rb

Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream

2026-03-25 21:36:32 +01:00

ldap_authenticable.rb

LDAP: Fix attempted modification of frozen hash (#39571)

2026-06-23 17:35:29 +02:00

omniauthable.rb

…

pam_authenticable.rb

…