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
..
activitypub	Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream	2024-09-12 12:09:21 +02:00
node_info	nodeinfo: add instance name and description (#28079)	2023-11-28 00:51:22 +00:00
rest	Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream	2024-09-16 21:08:58 +02:00
web	Update dependency rubocop-rails to v2.20.1 (#25493)	2023-07-13 11:44:02 +02:00
initial_state_serializer.rb	Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream	2024-08-27 20:00:07 +02:00
manifest_serializer.rb	Add `icon` field to instance endpoint (#30205)	2024-08-22 10:04:27 +00:00
oauth_metadata_serializer.rb	Enable OAuth PKCE Extension (#31129)	2024-07-26 08:53:10 +00:00
oembed_serializer.rb	Change design of embed modal in web UI (#31801)	2024-09-12 12:54:16 +00:00
webfinger_serializer.rb	Add avatar image to webfinger responses (#26558)	2023-08-31 13:46:27 +02:00