Claire 665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: An upstream refactor touched lines adjacent to ones modified in glitch-soc. Ported upstream's changes.		2024-09-16 21:08:58 +02:00
..
v1	Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream	2024-08-22 19:54:20 +02:00
v2	Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream	2024-09-16 21:08:58 +02:00
web	Improve spec coverage for `api/web/push_subscriptions` controller (#27858)	2023-11-15 13:14:51 +00:00
base_controller.rb	Add endpoints for unread notifications count (#31191)	2024-07-30 08:39:11 +00:00
oembed_controller.rb	…